- Move JumpTo to the main window
- Simplify progress dialog for JumpTo - TODO: this code is buggy. SGPEMv2 won't exit after using JumpTo, unless you kill it explicitly. git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1113 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog
parent
538470f96c
commit
0fe1e13ef9
|
|
@ -1,344 +1,74 @@
|
|||
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
||||
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
|
||||
<!-- Generated with glade3
|
||||
Version: 3.0.1
|
||||
Date: Tue Sep 12 21:18:38 2006
|
||||
User: matteo
|
||||
Host: tulip
|
||||
-->
|
||||
<glade-interface>
|
||||
|
||||
<widget class="GtkDialog" id="JumpToDialog">
|
||||
<property name="title">Jump To...</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_MOUSE</property>
|
||||
<property name="modal">True</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
<property name="skip_pager_hint">False</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<property name="focus_on_map">True</property>
|
||||
<property name="urgency_hint">False</property>
|
||||
<property name="has_separator">True</property>
|
||||
|
||||
<child internal-child="vbox">
|
||||
<widget class="GtkVBox" id="MainVBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child internal-child="action_area">
|
||||
<widget class="GtkHButtonBox" id="MainButtonBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="OK.Button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="has_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-ok</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-5</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="pack_type">GTK_PACK_END</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="ProgressBox">
|
||||
<property name="border_width">4</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">6</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTable" id="Instant.Table">
|
||||
<property name="visible">True</property>
|
||||
<property name="n_rows">1</property>
|
||||
<property name="n_columns">3</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="row_spacing">0</property>
|
||||
<property name="column_spacing">6</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkSpinButton" id="Instant.Spin">
|
||||
<property name="width_request">146</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="climb_rate">1</property>
|
||||
<property name="digits">0</property>
|
||||
<property name="numeric">True</property>
|
||||
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
|
||||
<property name="snap_to_ticks">False</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="adjustment">1 1 inf 1 10 10</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">expand</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="Instant.Label">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Instant</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="Jump.Button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment1">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image1">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-jump-to</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label1">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Jump!</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">2</property>
|
||||
<property name="right_attach">3</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHSeparator" id="Separator">
|
||||
<property name="visible">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTable" id="Progress.Table">
|
||||
<property name="visible">True</property>
|
||||
<property name="n_rows">1</property>
|
||||
<property name="n_columns">2</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="row_spacing">0</property>
|
||||
<property name="column_spacing">6</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="Stop.Button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment2">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox2">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image2">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-media-stop</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="Stop.Label">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Stop</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
<property name="width_chars">-1</property>
|
||||
<property name="single_line_mode">False</property>
|
||||
<property name="angle">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="x_options">fill</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkProgressBar" id="ProgressBar">
|
||||
<property name="visible">True</property>
|
||||
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
|
||||
<property name="fraction">0</property>
|
||||
<property name="pulse_step">0.10000000149</property>
|
||||
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="right_attach">1</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="bottom_attach">1</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">4</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkDialog" id="JumpToDialog">
|
||||
<property name="title">Jump To...</property>
|
||||
<property name="modal">True</property>
|
||||
<property name="window_position">GTK_WIN_POS_MOUSE</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
|
||||
<child internal-child="vbox">
|
||||
<widget class="GtkVBox" id="MainVBox">
|
||||
<property name="visible">True</property>
|
||||
<child>
|
||||
<widget class="GtkVBox" id="ProgressBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="border_width">4</property>
|
||||
<property name="spacing">6</property>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="Label.Description">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>Please wait...</b>
|
||||
while we advance the simulation to fulfill your request:</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_CENTER</property>
|
||||
<property name="wrap">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkProgressBar" id="ProgressBar">
|
||||
<property name="visible">True</property>
|
||||
<property name="pulse_step">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="fill">False</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child internal-child="action_area">
|
||||
<widget class="GtkHButtonBox" id="MainButtonBox">
|
||||
<property name="visible">True</property>
|
||||
<property name="layout_style">GTK_BUTTONBOX_END</property>
|
||||
<child>
|
||||
<widget class="GtkButton" id="Button.Stop">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="has_focus">True</property>
|
||||
<property name="is_focus">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="has_default">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="label" translatable="yes">gtk-media-stop</property>
|
||||
<property name="use_stock">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="pack_type">GTK_PACK_END</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</glade-interface>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -51,6 +51,7 @@
|
|||
#include <glibmm/markup.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <gtkmm/aboutdialog.h>
|
||||
#include <gtkmm/button.h>
|
||||
#include <gtkmm/messagedialog.h>
|
||||
#include <gtkmm/menutoolbutton.h>
|
||||
#include <gtkmm/filechooserdialog.h>
|
||||
|
|
@ -60,6 +61,7 @@
|
|||
#include <gtkmm/radiomenuitem.h>
|
||||
#include <gtkmm/radiobuttongroup.h>
|
||||
#include <gtkmm/scrolledwindow.h>
|
||||
#include <gtkmm/spinbutton.h>
|
||||
#include <gtkmm/statusbar.h>
|
||||
#include <gtkmm/stock.h>
|
||||
|
||||
|
|
@ -77,16 +79,26 @@ GuiBuilder::on_edit_preferences_activate()
|
|||
}
|
||||
|
||||
void
|
||||
GuiBuilder::on_simulation_jump_to_activate()
|
||||
GuiBuilder::on_simulation_jump_to_clicked()
|
||||
{
|
||||
using Gnome::Glade::Xml;
|
||||
|
||||
Glib::RefPtr<Xml> jump_to_dialog_glade = Xml::create(GLADEDIR "/jump-to-dialog.glade");
|
||||
// JumpTo spinbox
|
||||
Gtk::SpinButton* jump_to_spin;
|
||||
_refXml->get_widget("BottomHBox.JumpToSpin", jump_to_spin);
|
||||
int target_instant = jump_to_spin->get_value_as_int();
|
||||
assert(target_instant > 0);
|
||||
|
||||
Glib::RefPtr<Xml> jump_to_dialog_glade = Xml::create(GLADEDIR "/jump-to-dialog.glade");
|
||||
JumpToDialog* jump_to_dialog = NULL;
|
||||
jump_to_dialog_glade->get_widget_derived("JumpToDialog", jump_to_dialog);
|
||||
|
||||
jump_to_dialog->set_transient_for(get_initial_window());
|
||||
jump_to_dialog->set_target_instant(target_instant);
|
||||
jump_to_dialog->run();
|
||||
|
||||
jump_to_dialog->hide();
|
||||
delete jump_to_dialog;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -545,11 +557,6 @@ GuiBuilder::GuiBuilder(const std::string& gladefile)
|
|||
_refXml->get_widget("MenuItem.Edit.Preferences", edit_preferences);
|
||||
edit_preferences->signal_activate().connect(sigc::mem_fun(*this, &GuiBuilder::on_edit_preferences_activate));
|
||||
|
||||
// JumpTo
|
||||
MenuItem* simulation_jump_to = NULL;
|
||||
_refXml->get_widget("MenuItem.Simulation.JumpTo", simulation_jump_to);
|
||||
simulation_jump_to->signal_activate().connect(sigc::mem_fun(*this, &GuiBuilder::on_simulation_jump_to_activate));
|
||||
|
||||
// enable/disable show threads on widgets
|
||||
MenuItem* show_threads;
|
||||
_refXml->get_widget("MenuItem.View.ShowThreads", show_threads);
|
||||
|
|
@ -633,12 +640,18 @@ GuiBuilder::GuiBuilder(const std::string& gladefile)
|
|||
|
||||
// ReadyQueue custom label widget
|
||||
ReadyQueueWidget& rq_widget = *manage(new ReadyQueueWidget(Simulation::get_instance().get_history()));
|
||||
HBox* rqb;
|
||||
_refXml->get_widget("ReadyQueueBox", rqb);
|
||||
rqb->pack_start(rq_widget);
|
||||
HBox* bottomhbox;
|
||||
_refXml->get_widget("BottomHBox", bottomhbox);
|
||||
bottomhbox->pack_start(rq_widget);
|
||||
rq_widget.show();
|
||||
|
||||
|
||||
// JumpTo button
|
||||
Button* simulation_jump_to = NULL;
|
||||
_refXml->get_widget("BottomHBox.JumpToButton", simulation_jump_to);
|
||||
simulation_jump_to->signal_clicked().connect(sigc::mem_fun(*this, &GuiBuilder::on_simulation_jump_to_clicked));
|
||||
|
||||
|
||||
// HoltGraph container window
|
||||
_holt_container.set_keep_above();
|
||||
_holt_container.get_holt_widget().set_show_threads(_show_threads);
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ namespace sgpem
|
|||
|
||||
void on_edit_preferences_activate();
|
||||
|
||||
void on_simulation_jump_to_activate();
|
||||
void on_simulation_jump_to_clicked();
|
||||
|
||||
void on_view_show_threads_activate();
|
||||
void on_view_show_holt_graph_activate();
|
||||
|
|
@ -82,10 +82,9 @@ namespace sgpem
|
|||
std::string _filename;
|
||||
|
||||
HoltContainerWindow _holt_container;
|
||||
StatisticsContainerWindow _statistics_container;
|
||||
StatisticsContainerWindow _statistics_container;
|
||||
SimulationWidget* _simulation_widget;
|
||||
bool _show_threads;
|
||||
|
||||
};
|
||||
|
||||
} //~ namespace sgpem
|
||||
|
|
|
|||
|
|
@ -31,53 +31,49 @@
|
|||
#include <gtkmm/main.h>
|
||||
#include <gtkmm/messagedialog.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
|
||||
using namespace sgpem;
|
||||
using namespace Gtk;
|
||||
using namespace Glib;
|
||||
using Gnome::Glade::Xml;
|
||||
using std::vector;
|
||||
|
||||
|
||||
JumpToDialog::JumpToDialog(BaseObjectType* cobject, const RefPtr<Xml>& glade) :
|
||||
Dialog(cobject), _glade(glade), _target_instant(0)
|
||||
{
|
||||
_glade->get_widget("OK.Button", _ok_button);
|
||||
_glade->get_widget("Jump.Button", _jump_button);
|
||||
_glade->get_widget("Stop.Button", _stop_button);
|
||||
_glade->get_widget("Instant.Spin", _instant_spin);
|
||||
_glade->get_widget("Button.Stop", _stop_button);
|
||||
_glade->get_widget("ProgressBar", _progress);
|
||||
|
||||
|
||||
/** ATTACH SIGNAL HANDLERS FOR BUTTONS **/
|
||||
|
||||
_jump_button->signal_clicked().connect(
|
||||
sigc::mem_fun(*this, &JumpToDialog::_on_jump));
|
||||
|
||||
_stop_button->signal_clicked().connect(
|
||||
sigc::mem_fun(*this, &JumpToDialog::_on_stop));
|
||||
|
||||
_ok_button->signal_clicked().connect(sigc::bind(
|
||||
sigc::mem_fun(*this, &JumpToDialog::response), RESPONSE_OK));
|
||||
_ok_button->signal_clicked().connect(
|
||||
sigc::mem_fun(*this, &JumpToDialog::hide));
|
||||
|
||||
// FIXME: not implemented
|
||||
_stop_button->set_sensitive(false);
|
||||
// Attach signal handlers for the Stop button
|
||||
_stop_button->signal_clicked().connect(sigc::mem_fun(*this, &JumpToDialog::_on_stop));
|
||||
signal_show().connect(sigc::mem_fun(*this, &JumpToDialog::_on_jump));
|
||||
}
|
||||
|
||||
|
||||
unsigned int
|
||||
JumpToDialog::set_target_instant(unsigned int new_target)
|
||||
{
|
||||
unsigned int temp = _target_instant;
|
||||
_target_instant = new_target;
|
||||
return temp;
|
||||
}
|
||||
|
||||
|
||||
unsigned int
|
||||
JumpToDialog::get_target_instant() const
|
||||
{
|
||||
return _target_instant;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
JumpToDialog::_on_jump()
|
||||
{
|
||||
_ok_button->set_sensitive(false);
|
||||
_stop_button->set_sensitive(true);
|
||||
_jump_button->set_sensitive(false);
|
||||
_progress->set_fraction(0.0);
|
||||
|
||||
assert(_instant_spin->get_value_as_int() > 0);
|
||||
_target_instant = _instant_spin->get_value_as_int();
|
||||
assert(_target_instant > 0);
|
||||
|
||||
Simulation& sim = Simulation::get_instance();
|
||||
History& h = sim.get_history();
|
||||
|
|
@ -99,19 +95,19 @@ JumpToDialog::_on_jump()
|
|||
break; // Simulation ended before reaching _target_instant
|
||||
}
|
||||
}
|
||||
// TODO: exception handling copied from SimulationController, it should be factored out
|
||||
// TODO: exception handling copied from SimulationController, it should be factored out (?)
|
||||
catch(const UserInterruptException& uie)
|
||||
{
|
||||
// Show the user a dialog
|
||||
MessageDialog diag(_("<b>The selected user CPU policy stopped before returning:</b>\n") + Markup::escape_text(uie.what()),
|
||||
true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||
true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||
diag.run();
|
||||
}
|
||||
catch(const MalformedPolicyException& mpe)
|
||||
{
|
||||
// Show user a dialog
|
||||
MessageDialog diag(_("<b>The selected user CPU policy was malformed and failed to sort the queue:</b>\n") +
|
||||
Markup::escape_text(mpe.what()), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||
Markup::escape_text(mpe.what()), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||
diag.run();
|
||||
|
||||
try
|
||||
|
|
@ -130,31 +126,41 @@ JumpToDialog::_on_jump()
|
|||
catch(const NullPolicyException& npe)
|
||||
{
|
||||
MessageDialog diag(_("<b>No active policy selected:</b>\n") + Markup::escape_text(npe.what()),
|
||||
true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||
true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||
diag.run();
|
||||
|
||||
}
|
||||
catch(const CPUPolicyException& cpe)
|
||||
{
|
||||
MessageDialog diag(_("<b>Unexpected error</b>:\n") + Markup::escape_text(cpe.what()),
|
||||
true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||
true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
|
||||
diag.run();
|
||||
}
|
||||
|
||||
h.set_notify_enabled(reenable);
|
||||
// Ending successfully: detach me, reenable notifications,
|
||||
// and emit response ``okay''
|
||||
sim.detach(*this);
|
||||
|
||||
_ok_button->set_sensitive(true);
|
||||
_stop_button->set_sensitive(false);
|
||||
_jump_button->set_sensitive(true);
|
||||
h.set_notify_enabled(reenable);
|
||||
response(Gtk::RESPONSE_OK);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
JumpToDialog::_on_stop()
|
||||
{
|
||||
Simulation::get_instance().stop();
|
||||
response(Gtk::RESPONSE_CANCEL);
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
JumpToDialog::on_delete_event(GdkEventAny* event)
|
||||
{
|
||||
_on_stop();
|
||||
return Dialog::on_delete_event(event);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
JumpToDialog::update(const Simulation& changed_simulation)
|
||||
{
|
||||
|
|
@ -168,5 +174,5 @@ JumpToDialog::update(const Simulation& changed_simulation)
|
|||
// intensive computation it doesn't have
|
||||
// the time to flush all UI events):
|
||||
while(Gtk::Main::events_pending())
|
||||
Gtk::Main::iteration();
|
||||
Gtk::Main::iteration();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@
|
|||
|
||||
#include <sgpemv2/simulation_observer.hh>
|
||||
|
||||
#include <gtkmm/button.h>
|
||||
#include <gtkmm/dialog.h>
|
||||
#include <gtkmm/spinbutton.h>
|
||||
#include <gtkmm/progressbar.h>
|
||||
#include <libglademm/xml.h>
|
||||
|
||||
|
|
@ -37,6 +37,12 @@ namespace sgpem
|
|||
public:
|
||||
JumpToDialog(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade);
|
||||
|
||||
unsigned int set_target_instant(unsigned int new_target = 0);
|
||||
unsigned int get_target_instant() const;
|
||||
|
||||
protected:
|
||||
bool on_delete_event(GdkEventAny* event);
|
||||
|
||||
private:
|
||||
void _on_jump();
|
||||
void _on_stop();
|
||||
|
|
@ -45,11 +51,7 @@ namespace sgpem
|
|||
|
||||
Glib::RefPtr<Gnome::Glade::Xml> _glade;
|
||||
|
||||
Gtk::Button* _jump_button;
|
||||
Gtk::Button* _stop_button;
|
||||
Gtk::Button* _ok_button;
|
||||
Gtk::SpinButton* _instant_spin;
|
||||
|
||||
Gtk::ProgressBar* _progress;
|
||||
|
||||
unsigned int _target_instant;
|
||||
|
|
|
|||
Loading…
Reference in New Issue