From b3999f28039072bd5e9453d6db103df678073520 Mon Sep 17 00:00:00 2001
From: tchernobog <tchernobog@3ecf2c5c-341e-0410-92b4-d18e462d057c>
Date: Sun, 17 Sep 2006 12:30:39 +0000
Subject: [PATCH] - Set icon for main window - Enable startup notification in
 GNOME via desktop file

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1224 3ecf2c5c-341e-0410-92b4-d18e462d057c
---
 data/sgpemv2.desktop    |    1 +
 glade/main-window.glade | 1231 ++++++++++++++++-----------------------
 po/POTFILES.in          |    1 -
 po/sgpemv2.pot          |   64 +-
 4 files changed, 531 insertions(+), 766 deletions(-)

diff --git a/data/sgpemv2.desktop b/data/sgpemv2.desktop
index ec452b6..219dac9 100644
--- a/data/sgpemv2.desktop
+++ b/data/sgpemv2.desktop
@@ -15,4 +15,5 @@ Comment[it]=Un programma educativo che mostra la gestione dei processi in un sis
 Icon=scc-sgpemv2
 
 Exec=sgpemv2 '%f'
+StartupNotify=true
 Terminal=false
diff --git a/glade/main-window.glade b/glade/main-window.glade
index eda8c5f..d4f9732 100644
--- a/glade/main-window.glade
+++ b/glade/main-window.glade
@@ -1,736 +1,521 @@
-<?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: Sun Sep 17 14:11:03 2006
+	User: matteo
+	Host: tulip
+-->
 <glade-interface>
-
-<widget class="GtkWindow" id="MainWindow">
-  <property name="title">SGPEMv2</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">800</property>
-  <property name="default_height">600</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon_name">gtk-dialog-warning</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_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-
-  <child>
-    <widget class="GtkVBox" id="MainBox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkMenuBar" id="MenuBar">
-	  <property name="visible">True</property>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="MenuItem.File">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_File</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="MenuItem.File_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.File.New">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-new</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.File.Open">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-open</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.File.Save">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-save</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.File.SaveAs">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-save-as</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator1">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.File.Quit">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-quit</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="MenuItem.Edit">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Edit</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="MenuItem.Edit_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.Edit.Preferences">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-preferences</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="MenuItem.View">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_View</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="MenuItem.View_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.View.ShowThreads">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Enable/disable threads visualization in Graphs</property>
-		      <property name="label" translatable="yes">Show/Hide _Threads</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image11">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-select-font</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.View.ShowHoltGraph">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Show/Hide holt graph window</property>
-		      <property name="label" translatable="yes">Show/Hide _Holt Graph</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image12">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-convert</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.View.ShowStatistics">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Show/Hide statistics window</property>
-		      <property name="label" translatable="yes">Show/Hide _Statistics</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image13">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-justify-left</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="MenuItem.Simulation">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Simulation</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="MenuItem.Simulation_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.Simulation.Play">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-media-play</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.Simulation.Pause">
-		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
-		      <property name="label">gtk-media-pause</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.Simulation.Stop">
-		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
-		      <property name="label">gtk-media-stop</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_stop1_activate"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="MenuItem.Simulation.Separator1">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="MenuItem.Simulation.ContinuousMode">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Continuous mode</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="MenuItem.Help">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Help</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="MenuItem.Help_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="MenuItem.Help.About">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-about</property>
-		      <property name="use_stock">True</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkToolbar" id="ToolBar">
-	  <property name="visible">True</property>
-	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-	  <property name="tooltips">True</property>
-	  <property name="show_arrow">True</property>
-
-	  <child>
-	    <widget class="GtkToolButton" id="ToolBar.Open">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-open</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkToolButton" id="ToolBar.Save">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-save</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="ToolBar.Separator0">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkToolButton" id="ToolBar.Play">
-	      <property name="visible">True</property>
-	      <property name="tooltip">Start the simulation</property>
-	      <property name="stock_id">gtk-media-play</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkToolButton" id="ToolBar.Pause">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="stock_id">gtk-media-pause</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkToolButton" id="ToolBar.Stop">
-	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
-	      <property name="stock_id">gtk-media-stop</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="ToolBar.Separator1">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuToolButton" id="ToolBar.PolicySelector">
-	      <property name="visible">True</property>
-	      <property name="label">Scheduling Policy</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-convert</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="ToolBar.Separator2">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuToolButton" id="ToolBar.ResourceScheduling">
-	      <property name="visible">True</property>
-	      <property name="label">Resource Scheduling</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-select-color</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</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="GtkStatusbar" id="MainStatusBar">
-	  <property name="visible">True</property>
-	  <property name="has_resize_grip">True</property>
-	</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="GtkVPaned" id="MainVPaned">
-	  <property name="border_width">1</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="position">200</property>
-
-	  <child>
-	    <widget class="GtkHPaned" id="EntitiesHPaned">
-	      <property name="visible">True</property>
-
-	      <child>
-		<widget class="GtkFrame" id="SchedulablesFrame">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="SchedulablesFrame.Alignment">
-		      <property name="visible">True</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="SchedulablesScrolledWindow">
-			  <property name="visible">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="SchedulablesFrame.Label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;i&gt;Schedulables&lt;/i&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">2</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="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="shrink">True</property>
-		  <property name="resize">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="ResourcesFrame">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="SchedulablesFrame.Alignment">
-		      <property name="visible">True</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="ResourcesScrolledWindow">
-			  <property name="visible">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <widget class="GtkTreeView" id="Resources.Tree">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="headers_visible">True</property>
-			      <property name="rules_hint">False</property>
-			      <property name="reorderable">False</property>
-			      <property name="enable_search">True</property>
-			      <property name="fixed_height_mode">False</property>
-			      <property name="hover_selection">False</property>
-			      <property name="hover_expand">False</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="ResourcesFrame.Label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;i&gt;Resources&lt;/i&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">2</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="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="shrink">True</property>
-		  <property name="resize">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="shrink">False</property>
-	      <property name="resize">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="SimulationScrolledWindow">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<placeholder/>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="shrink">True</property>
-	      <property name="resize">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="BottomHBox">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkVSeparator" id="BottomHBox.VSeparator">
-	      <property name="visible">True</property>
-	    </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="GtkSpinButton" id="BottomHBox.JumpToSpin">
-	      <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">False</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="padding">3</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	      <property name="pack_type">GTK_PACK_END</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="BottomHBox.JumpToButton">
-	      <property name="visible">True</property>
-	      <property name="label">gtk-jump-to</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </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>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkAboutDialog" id="AboutDialog">
-  <property name="destroy_with_parent">False</property>
-  <property name="name" translatable="yes">Application Name</property>
-  <property name="copyright">University of Padova, dept. of Pure and Applied Mathematics</property>
-  <property name="comments">An educational simulator for process scheduling policies in a monoprocessor computer.</property>
-  <property name="license">SGPEMv2 comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under the terms of the GNU General Public License; for details see file COPYING contained in the source package.</property>
-  <property name="authors">Filippo Paparella &lt;ironpipp@gmail.com&gt;
+  <widget class="GtkWindow" id="MainWindow">
+    <property name="title">SGPEMv2</property>
+    <property name="default_width">800</property>
+    <property name="default_height">600</property>
+    <property name="icon_name">scc-sgpemv2</property>
+    <child>
+      <widget class="GtkVBox" id="MainBox">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkMenuBar" id="MenuBar">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkMenuItem" id="MenuItem.File">
+                <property name="visible">True</property>
+                <property name="label">_File</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="MenuItem.File_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.File.New">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-new</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.File.Open">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-open</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.File.Save">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-save</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.File.SaveAs">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-save-as</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.File.Quit">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-quit</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="MenuItem.Edit">
+                <property name="visible">True</property>
+                <property name="label">_Edit</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="MenuItem.Edit_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.Edit.Preferences">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-preferences</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="MenuItem.View">
+                <property name="visible">True</property>
+                <property name="label">_View</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="MenuItem.View_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.View.ShowThreads">
+                        <property name="visible">True</property>
+                        <property name="tooltip">Enable/disable threads visualization in Graphs</property>
+                        <property name="label">Show/Hide _Threads</property>
+                        <property name="use_underline">True</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image11">
+                            <property name="visible">True</property>
+                            <property name="xalign">0,000000</property>
+                            <property name="yalign">0,000000</property>
+                            <property name="stock">gtk-select-font</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.View.ShowHoltGraph">
+                        <property name="visible">True</property>
+                        <property name="tooltip">Show/Hide holt graph window</property>
+                        <property name="label">Show/Hide _Holt Graph</property>
+                        <property name="use_underline">True</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image12">
+                            <property name="visible">True</property>
+                            <property name="xalign">0,000000</property>
+                            <property name="yalign">0,000000</property>
+                            <property name="stock">gtk-convert</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.View.ShowStatistics">
+                        <property name="visible">True</property>
+                        <property name="tooltip">Show/Hide statistics window</property>
+                        <property name="label">Show/Hide _Statistics</property>
+                        <property name="use_underline">True</property>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image13">
+                            <property name="visible">True</property>
+                            <property name="xalign">0,000000</property>
+                            <property name="yalign">0,000000</property>
+                            <property name="stock">gtk-justify-left</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="MenuItem.Simulation">
+                <property name="visible">True</property>
+                <property name="label">_Simulation</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="MenuItem.Simulation_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.Simulation.Play">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-media-play</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.Simulation.Pause">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label">gtk-media-pause</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.Simulation.Stop">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label">gtk-media-stop</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_stop1_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="MenuItem.Simulation.Separator1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="MenuItem.Simulation.ContinuousMode">
+                        <property name="visible">True</property>
+                        <property name="active">True</property>
+                        <property name="label">Continuous mode</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="MenuItem.Help">
+                <property name="visible">True</property>
+                <property name="label">_Help</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="MenuItem.Help_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="MenuItem.Help.About">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-about</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkToolbar" id="ToolBar">
+            <property name="visible">True</property>
+            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+            <child>
+              <widget class="GtkToolButton" id="ToolBar.Open">
+                <property name="visible">True</property>
+                <property name="stock_id">gtk-open</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkToolButton" id="ToolBar.Save">
+                <property name="visible">True</property>
+                <property name="stock_id">gtk-save</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkSeparatorToolItem" id="ToolBar.Separator0">
+                <property name="visible">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkToolButton" id="ToolBar.Play">
+                <property name="visible">True</property>
+                <property name="stock_id">gtk-media-play</property>
+                <property name="tooltip">Start the simulation</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkToolButton" id="ToolBar.Pause">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="stock_id">gtk-media-pause</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkToolButton" id="ToolBar.Stop">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="stock_id">gtk-media-stop</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkSeparatorToolItem" id="ToolBar.Separator1">
+                <property name="visible">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuToolButton" id="ToolBar.PolicySelector">
+                <property name="visible">True</property>
+                <property name="label">Scheduling Policy</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-convert</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkSeparatorToolItem" id="ToolBar.Separator2">
+                <property name="visible">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuToolButton" id="ToolBar.ResourceScheduling">
+                <property name="visible">True</property>
+                <property name="label">Resource Scheduling</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-select-color</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkVPaned" id="MainVPaned">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="border_width">1</property>
+            <property name="position">200</property>
+            <child>
+              <widget class="GtkHPaned" id="EntitiesHPaned">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkFrame" id="SchedulablesFrame">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0,000000</property>
+                    <property name="label_yalign">0,000000</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="SchedulablesFrame.Alignment">
+                        <property name="visible">True</property>
+                        <property name="xalign">0,000000</property>
+                        <property name="yalign">0,000000</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkScrolledWindow" id="SchedulablesScrolledWindow">
+                            <property name="visible">True</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="shadow_type">GTK_SHADOW_OUT</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="SchedulablesFrame.Label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0,000000</property>
+                        <property name="yalign">0,000000</property>
+                        <property name="ypad">2</property>
+                        <property name="label" translatable="yes">&lt;i&gt;Schedulables&lt;/i&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="resize">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="ResourcesFrame">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0,000000</property>
+                    <property name="label_yalign">0,000000</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="SchedulablesFrame.Alignment">
+                        <property name="visible">True</property>
+                        <property name="xalign">0,000000</property>
+                        <property name="yalign">0,000000</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkScrolledWindow" id="ResourcesScrolledWindow">
+                            <property name="visible">True</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="shadow_type">GTK_SHADOW_OUT</property>
+                            <child>
+                              <widget class="GtkTreeView" id="Resources.Tree">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="ResourcesFrame.Label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0,000000</property>
+                        <property name="yalign">0,000000</property>
+                        <property name="ypad">2</property>
+                        <property name="label" translatable="yes">&lt;i&gt;Resources&lt;/i&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="resize">False</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkScrolledWindow" id="SimulationScrolledWindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHBox" id="BottomHBox">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkButton" id="BottomHBox.JumpToButton">
+                <property name="visible">True</property>
+                <property name="label">gtk-jump-to</property>
+                <property name="use_stock">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkSpinButton" id="BottomHBox.JumpToSpin">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">0 1 0 1 10 10</property>
+                <property name="climb_rate">1</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="padding">3</property>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVSeparator" id="BottomHBox.VSeparator">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="pack_type">GTK_PACK_END</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkStatusbar" id="MainStatusBar">
+            <property name="visible">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkAboutDialog" id="AboutDialog">
+    <property name="copyright">University of Padova, dept. of Pure and Applied Mathematics</property>
+    <property name="comments">An educational simulator for process scheduling policies in a monoprocessor computer.</property>
+    <property name="license">SGPEMv2 comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under the terms of the GNU General Public License; for details see file COPYING contained in the source package.</property>
+    <property name="authors">Filippo Paparella &lt;ironpipp@gmail.com&gt;
 Paolo Santi       &lt;psanti@studenti.math.unipd.it&gt;
 Matteo Settenvini &lt;matteo@member.fsf.org&gt;
 Marco Trevisan    &lt;mtrevisa@studenti.math.unipd.it&gt;
 Djina Verbanac    &lt;betalgez@yahoo.com&gt;
 Luca Vezzaro      &lt;lvezzaro@studenti.math.unipd.it&gt;</property>
-  <property name="documenters">Giovanni Giacobbi &lt;ggiacobb@studenti.math.unipd.it&gt;
+    <property name="documenters">Giovanni Giacobbi &lt;ggiacobb@studenti.math.unipd.it&gt;
 Filippo Paparella &lt;ironpipp@gmail.com&gt;
 Paolo Santi       &lt;psanti@studenti.math.unipd.it&gt;
 Matteo Settenvini &lt;matteo@member.fsf.org&gt;
 Marco Trevisan    &lt;mtrevisa@studenti.math.unipd.it&gt;
 Djina Verbanac    &lt;betalgez@yahoo.com&gt;
 Luca Vezzaro      &lt;lvezzaro@studenti.math.unipd.it&gt;</property>
-  <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="AboutDialog.VBox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
-
-      <child>
-	<placeholder/>
-      </child>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="AboutDialog.ActionArea">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	</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>
-    </widget>
-  </child>
-</widget>
-
+    <property name="translator_credits">translator-credits</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="AboutDialog.VBox">
+        <property name="visible">True</property>
+        <property name="spacing">12</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="AboutDialog.ActionArea">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index da48915..65627d9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ src/main.cc
 src/cairo_widget.cc
 src/add_request_dialog.cc
 src/graphical_preferences_editor.cc
-src/schedulable_state_widget.cc
 src/backend/sub_request.cc
 src/backend/ready_queue.cc
 src/backend/default_resource_policy_manager.cc
diff --git a/po/sgpemv2.pot b/po/sgpemv2.pot
index 3ea044d..5ec6606 100644
--- a/po/sgpemv2.pot
+++ b/po/sgpemv2.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: matteo@member.fsf.org\n"
-"POT-Creation-Date: 2006-09-16 15:37+0200\n"
+"POT-Creation-Date: 2006-09-17 14:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,17 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/gui_builder.cc:152
-msgid ""
-"<b>Want to save?</b>\n"
-"You'll lose your changes if you don't."
-msgstr ""
-
-#: src/gui_builder.cc:221 src/gui_builder.cc:264 src/gui_builder.cc:334
+#: src/gui_builder.cc:215 src/gui_builder.cc:258 src/gui_builder.cc:328
 msgid "ERROR: No registered serializer available"
 msgstr ""
 
-#: src/gui_builder.cc:226 src/gui_builder.cc:269 src/gui_builder.cc:339
+#: src/gui_builder.cc:220 src/gui_builder.cc:263 src/gui_builder.cc:333
 #: src/text_simulation.cc:399 src/text_simulation.cc:405
 #: src/text_simulation.cc:424 src/text_simulation.cc:490
 #: src/text_simulation.cc:496 src/text_simulation.cc:515
@@ -35,37 +29,43 @@ msgstr ""
 msgid "ERROR: "
 msgstr ""
 
-#: src/gui_builder.cc:361 src/gui_builder.cc:389
+#: src/gui_builder.cc:355 src/gui_builder.cc:383
 msgid ""
 "<b>No CPU policy is currently selected.</b>\n"
 "Please choose one before trying to configure it."
 msgstr ""
 
-#: src/gui_builder.cc:367 src/gui_builder.cc:396
+#: src/gui_builder.cc:361 src/gui_builder.cc:390
 msgid "Configuring CPU Policy "
 msgstr ""
 
-#: src/gui_builder.cc:455
+#: src/gui_builder.cc:449
 msgid "Selected CPU policy "
 msgstr ""
 
-#: src/gui_builder.cc:463
+#: src/gui_builder.cc:457
 msgid "<b>Impossible to select this CPU Policy.</b>\n"
 msgstr ""
 
-#: src/gui_builder.cc:469
+#: src/gui_builder.cc:463
 msgid "No CPU policy selected. Please select one."
 msgstr ""
 
-#: src/gui_builder.cc:517
+#: src/gui_builder.cc:511
 msgid "Current resource policy deselected."
 msgstr ""
 
-#: src/gui_builder.cc:519
+#: src/gui_builder.cc:513
 msgid "Selected resource policy "
 msgstr ""
 
-#: src/gui_builder.cc:700
+#: src/gui_builder.cc:537
+msgid ""
+"<b>Want to save?</b>\n"
+"You'll lose your changes if you don't."
+msgstr ""
+
+#: src/gui_builder.cc:715
 msgid "Filename to open: "
 msgstr ""
 
@@ -160,47 +160,27 @@ msgstr ""
 msgid "Select a directory to add"
 msgstr ""
 
-#: src/schedulable_state_widget.cc:66
-msgid "Future"
-msgstr ""
-
-#: src/schedulable_state_widget.cc:70
-msgid "Ready"
-msgstr ""
-
-#: src/schedulable_state_widget.cc:74
-msgid "Running"
-msgstr ""
-
-#: src/schedulable_state_widget.cc:78
-msgid "Blocked"
-msgstr ""
-
-#: src/schedulable_state_widget.cc:82
-msgid "Terminated"
-msgstr ""
-
 #: src/backend/global_preferences.cc:90
 msgid "Unable to obtain Application Data directory"
 msgstr ""
 
-#: src/backend/concrete_simulation.cc:239
+#: src/backend/concrete_simulation.cc:235
 msgid "unable to change policy and to restore the previous: "
 msgstr ""
 
-#: src/backend/concrete_simulation.cc:245
+#: src/backend/concrete_simulation.cc:241
 msgid "unable to change policy: "
 msgstr ""
 
-#: src/backend/string_utils.cc:54 src/backend/string_utils.cc:90
+#: src/backend/string_utils.cc:62 src/backend/string_utils.cc:102
 msgid "too few or too many tokens"
 msgstr ""
 
-#: src/backend/string_utils.cc:77
+#: src/backend/string_utils.cc:85
 msgid "incorrect number format"
 msgstr ""
 
-#: src/backend/string_utils.cc:113
+#: src/backend/string_utils.cc:125
 msgid "incorrect boolean"
 msgstr ""