matteo/sgpemv2
matteo
/
sgpemv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Ported wizards, altough still missing the way 

to copy them into the install destination directory
- Yaling in preferences treeviews
- Changing policy now resets history
- Corrected some detail in speed control widget


git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@995 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
matrevis 2006-09-02 11:47:06 +00:00
parent f003779a04
commit b4f8c61695
25 changed files with 1178 additions and 1088 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.am
View File

@ -522,3 +522,14 @@ noinst_DATA += \
src/testsuite/scheduling-wizards/wizard-complex-test \ src/testsuite/scheduling-wizards/wizard-complex-test \
src/testsuite/scheduling-wizards/wizard-priority-inversion-porno \ src/testsuite/scheduling-wizards/wizard-priority-inversion-porno \
src/testsuite/scheduling-wizards/wizard-block-fail src/testsuite/scheduling-wizards/wizard-block-fail
# environments/DiscWorld_unblock.xgp \
# environments/Fantozzi_lifo_requests.xgp \
# environments/FruitsBasket_complex.xgp \
# environments/Matteo_deadlock.xgp \
# environments/Modernita_gap_terminated.xgp \
# environments/Porno_priority_inversion.xgp \
# environments/ScuolaDiMileto_assert_fail.xgp \
# environments/ScuolaDiMileto_block_fail.xgp \
# environments/ScuolaDiMileto_gap_blocked.xgp \
# environments/ScuolaDiMileto_gap_fail.xgp

27
environments/DiscWorld_unblock.xgp Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="banana" id="reskey0" arrival-time="0" how-many="1" pre-emptible="false"/>
</resources>
<schedulables>
<process name="Unseen University" priority="0" arrival-time="0">
<threads>
<thread name="The Librarian" priority="0" arrival-delta="0" lasts-for="4">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="3"/>
</request>
</requests>
</thread>
<thread name="Rincewind" priority="0" arrival-delta="0" lasts-for="2">
<requests>
<request arrival-time="1">
<subrequest resource="0" lasts-for="2"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

37
environments/Fantozzi_lifo_requests.xgp Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="Telefono" id="reskey0" arrival-time="0" how-many="1" pre-emptible="false"/>
<resource name="Fax" id="reskey1" arrival-time="0" how-many="1" pre-emptible="false"/>
</resources>
<schedulables>
<process name="Ufficio Sinistri" priority="5" arrival-time="0">
<threads>
<thread name="Fantozzi" priority="5" arrival-delta="0" lasts-for="7">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="7"/>
</request>
</requests>
</thread>
<thread name="Filini" priority="4" arrival-delta="2" lasts-for="3">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="3"/>
<subrequest resource="1" lasts-for="3"/>
</request>
</requests>
</thread>
<thread name="Signorina Silvani" priority="3" arrival-delta="4" lasts-for="4">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="2"/>
<subrequest resource="1" lasts-for="2"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

125
environments/FruitsBasket_complex.xgp Normal file
View File

@ -0,0 +1,125 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="forchetta" id="reskey0" arrival-time="0" how-many="1" pre-emptible="false"/>
<resource name="ashi" id="reskey1" arrival-time="0" how-many="2" pre-emptible="false"/>
<resource name="dita" id="reskey2" arrival-time="0" how-many="10" pre-emptible="false"/>
</resources>
<schedulables>
<process name="Toru" priority="3" arrival-time="1">
<threads>
<thread name="toru-kun" priority="3" arrival-delta="0" lasts-for="4">
<requests/>
</thread>
</threads>
</process>
<process name="Yuki" priority="2" arrival-time="4">
<threads>
<thread name="yun-yun" priority="2" arrival-delta="0" lasts-for="3">
<requests/>
</thread>
</threads>
</process>
<process name="Kyo" priority="4" arrival-time="4">
<threads>
<thread name="kyon-kyon" priority="4" arrival-delta="0" lasts-for="1">
<requests/>
</thread>
</threads>
</process>
<process name="Shigure" priority="0" arrival-time="6">
<threads>
<thread name="gure" priority="0" arrival-delta="0" lasts-for="1">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="1"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="4"/>
</request>
</requests>
</thread>
</threads>
</process>
<process name="Kagura" priority="5" arrival-time="6">
<threads>
<thread name="kagura" priority="5" arrival-delta="0" lasts-for="10">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="5"/>
<subrequest resource="2" lasts-for="3"/>
</request>
<request arrival-time="5">
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
</request>
</requests>
</thread>
</threads>
</process>
<process name="Momiji" priority="0" arrival-time="12">
<threads>
<thread name="momiji-kun" priority="0" arrival-delta="0" lasts-for="1">
<requests/>
</thread>
</threads>
</process>
<process name="Hatori" priority="0" arrival-time="14">
<threads>
<thread name="tori" priority="0" arrival-delta="0" lasts-for="1">
<requests/>
</thread>
</threads>
</process>
<process name="Hatsuharu" priority="0" arrival-time="15">
<threads>
<thread name="haru" priority="0" arrival-delta="0" lasts-for="1">
<requests/>
</thread>
</threads>
</process>
<process name="Ayame" priority="0" arrival-time="15">
<threads>
<thread name="aya" priority="0" arrival-delta="0" lasts-for="6">
<requests>
<request arrival-time="2">
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
</request>
</requests>
</thread>
</threads>
</process>
<process name="Kisa" priority="0" arrival-time="17">
<threads>
<thread name="kisa" priority="0" arrival-delta="0" lasts-for="2">
<requests>
<request arrival-time="1">
<subrequest resource="1" lasts-for="3"/>
<subrequest resource="2" lasts-for="3"/>
</request>
</requests>
</thread>
</threads>
</process>
<process name="Ritsu" priority="0" arrival-time="16">
<threads>
<thread name="ri" priority="0" arrival-delta="0" lasts-for="2">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="1"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

34
environments/Matteo_deadlock.xgp Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="scythe" id="reskey0" arrival-time="0" how-many="1" pre-emptible="false"/>
<resource name="sword" id="reskey1" arrival-time="0" how-many="1" pre-emptible="false"/>
</resources>
<schedulables>
<process name="Antrophomorphic personification" priority="0" arrival-time="0">
<threads>
<thread name="Death" priority="0" arrival-delta="0" lasts-for="4">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="2"/>
</request>
<request arrival-time="1">
<subrequest resource="1" lasts-for="2"/>
</request>
</requests>
</thread>
<thread name="Susan Sto Helit" priority="0" arrival-delta="0" lasts-for="4">
<requests>
<request arrival-time="0">
<subrequest resource="1" lasts-for="2"/>
</request>
<request arrival-time="1">
<subrequest resource="0" lasts-for="2"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

20
environments/Modernita_gap_terminated.xgp Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources/>
<schedulables>
<process name="Rivoluzione" priority="1" arrival-time="0">
<threads>
<thread name="Copernico" priority="0" arrival-delta="0" lasts-for="3">
<requests/>
</thread>
<thread name="Bruno" priority="0" arrival-delta="3" lasts-for="2">
<requests/>
</thread>
<thread name="Galilei" priority="0" arrival-delta="6" lasts-for="3">
<requests/>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

39
environments/Porno_priority_inversion.xgp Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="Jenna Jameson" id="reskey0" arrival-time="0" how-many="2" pre-emptible="false"/>
</resources>
<schedulables>
<process name="&quot;Wet Dreams IV&quot;" priority="0" arrival-time="0">
<threads>
<thread name="Peter North" priority="10" arrival-delta="0" lasts-for="3">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="3"/>
</request>
</requests>
</thread>
</threads>
</process>
<process name="&quot;A Night With Jenna&quot;" priority="0" arrival-time="2">
<threads>
<thread name="Rocco Siffredi" priority="0" arrival-delta="0" lasts-for="3">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="3"/>
<subrequest resource="0" lasts-for="3"/>
</request>
</requests>
</thread>
<thread name="Mandingo" priority="5" arrival-delta="0" lasts-for="3">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="3"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

37
environments/ScuolaDiMileto_assert_fail.xgp Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="forchetta" id="reskey0" arrival-time="0" how-many="1" pre-emptible="false"/>
</resources>
<schedulables>
<process name="Scuola di Mileto" priority="0" arrival-time="0">
<threads>
<thread name="Anassimandro" priority="0" arrival-delta="0" lasts-for="3">
<requests>
<request arrival-time="1">
<subrequest resource="0" lasts-for="3"/>
</request>
<request arrival-time="2">
<subrequest resource="0" lasts-for="2"/>
</request>
</requests>
</thread>
<thread name="Anassimene" priority="0" arrival-delta="2" lasts-for="2">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="1"/>
</request>
</requests>
</thread>
<thread name="Eraclito" priority="0" arrival-delta="2" lasts-for="2">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="1"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

38
environments/ScuolaDiMileto_block_fail.xgp Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="ashi" id="reskey0" arrival-time="0" how-many="2" pre-emptible="false"/>
<resource name="forchetta" id="reskey1" arrival-time="0" how-many="1" pre-emptible="false"/>
</resources>
<schedulables>
<process name="Scuola di Mileto" priority="0" arrival-time="0">
<threads>
<thread name="Anassimandro" priority="0" arrival-delta="0" lasts-for="4">
<requests>
<request arrival-time="0">
<subrequest resource="1" lasts-for="4"/>
</request>
<request arrival-time="2">
<subrequest resource="1" lasts-for="3"/>
</request>
</requests>
</thread>
<thread name="Anassimene" priority="0" arrival-delta="1" lasts-for="6">
<requests>
<request arrival-time="0">
<subrequest resource="1" lasts-for="2"/>
</request>
</requests>
</thread>
<thread name="Pitagora" priority="0" arrival-delta="1" lasts-for="2">
<requests>
<request arrival-time="0">
<subrequest resource="1" lasts-for="2"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

35
environments/ScuolaDiMileto_gap_blocked.xgp Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="forchetta" id="reskey0" arrival-time="0" how-many="1" pre-emptible="false"/>
</resources>
<schedulables>
<process name="Pitagorici" priority="0" arrival-time="0">
<threads>
<thread name="Pitagora" priority="0" arrival-delta="0" lasts-for="5">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="5"/>
</request>
</requests>
</thread>
</threads>
</process>
<process name="Scuola di Mileto" priority="1" arrival-time="2">
<threads>
<thread name="Anassimene" priority="0" arrival-delta="1" lasts-for="4">
<requests/>
</thread>
<thread name="Anassimandro" priority="0" arrival-delta="0" lasts-for="2">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="1"/>
<subrequest resource="0" lasts-for="2"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

42
environments/ScuolaDiMileto_gap_fail.xgp Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0"?>
<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
<sgpem>
<resources>
<resource name="forchetta" id="reskey0" arrival-time="0" how-many="1" pre-emptible="false"/>
</resources>
<schedulables>
<process name="Pitagorici" priority="0" arrival-time="0">
<threads>
<thread name="Pitagora" priority="0" arrival-delta="0" lasts-for="4">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="4"/>
<subrequest resource="0" lasts-for="4"/>
</request>
<request arrival-time="2">
<subrequest resource="0" lasts-for="4"/>
</request>
</requests>
</thread>
</threads>
</process>
<process name="Scuola di Mileto" priority="0" arrival-time="3">
<threads>
<thread name="Anassimene" priority="0" arrival-delta="0" lasts-for="6">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="2"/>
</request>
</requests>
</thread>
<thread name="Anassimandro" priority="0" arrival-delta="0" lasts-for="2">
<requests>
<request arrival-time="0">
<subrequest resource="0" lasts-for="2"/>
</request>
</requests>
</thread>
</threads>
</process>
</schedulables>
</sgpem>

469
glade/configure-dialog.glade
View File

@ -1,156 +1,274 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<!-- Generated with glade3
Version: 3.0.1
Date: Sat Sep 2 11:38:29 2006
User: matteo
Host: tulip
-->
<glade-interface> <glade-interface>
<widget class="GtkDialog" id="ConfigureDialog"> <widget class="GtkDialog" id="ConfigureDialog">
<property name="height_request">0</property> <property name="height_request">0</property>
<property name="title">SGPEMv2 Preferences</property> <property name="title">SGPEMv2 Preferences</property>
<property name="modal">True</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="modal">True</property>
<property name="default_width">500</property> <property name="default_width">500</property>
<property name="default_height">300</property> <property name="default_height">300</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="icon_name">gtk-preferences</property> <property name="icon_name">gtk-preferences</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="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"> <child internal-child="vbox">
<widget class="GtkVBox" id="MainVBox"> <widget class="GtkVBox" id="MainVBox">
<property name="visible">True</property> <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_END</property>
<child>
<widget class="GtkButton" id="Close">
<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-close</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">-7</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> <child>
<widget class="GtkNotebook" id="TabBar"> <widget class="GtkNotebook" id="TabBar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="show_tabs">True</property>
<property name="show_border">False</property> <property name="show_border">False</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
<property name="enable_popup">False</property>
<child> <child>
<widget class="GtkVBox" id="Plugins.VBox"> <widget class="GtkVBox" id="Plugins.VBox">
<property name="visible">True</property>
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<widget class="GtkFrame" id="Plugins.Loaded.Frame"> <widget class="GtkFrame" id="Plugins.Loaded.Frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label_xalign">0,000000</property> <property name="label_xalign">0</property>
<property name="label_yalign">0,000000</property> <property name="label_yalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkAlignment" id="Plugins.Loaded.Alignment"> <widget class="GtkAlignment" id="Plugins.Loaded.Alignment">
<property name="visible">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="xalign">0,000000</property> <property name="visible">True</property>
<property name="yalign">0,000000</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="left_padding">12</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkScrolledWindow" id="Plugins.Loaded.ScrolledWindow"> <widget class="GtkScrolledWindow" id="Plugins.Loaded.ScrolledWindow">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child> <child>
<widget class="GtkTreeView" id="Plugins.Loaded.TreeView"> <widget class="GtkTreeView" id="Plugins.Loaded.TreeView">
<property name="height_request">200</property> <property name="height_request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> </widget>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="Plugins.Loaded.Label"> <widget class="GtkLabel" id="Plugins.Loaded.Label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">&lt;b&gt;Loaded Plugins&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Loaded Plugins&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</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">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> </widget>
<packing> <packing>
<property name="type">label_item</property> <property name="type">label_item</property>
</packing> </packing>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child> </child>
<child> <child>
<widget class="GtkFrame" id="Plugins.Additional.Frame"> <widget class="GtkFrame" id="Plugins.Additional.Frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label_xalign">0,000000</property> <property name="label_xalign">0</property>
<property name="label_yalign">0,000000</property> <property name="label_yalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkAlignment" id="Plugins.Additional.Alignment"> <widget class="GtkAlignment" id="Plugins.Additional.Alignment">
<property name="visible">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="xalign">0,000000</property> <property name="visible">True</property>
<property name="yalign">0,000000</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="left_padding">12</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkHBox" id="Plugins.Additional.HBox"> <widget class="GtkHBox" id="Plugins.Additional.HBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">10</property> <property name="spacing">10</property>
<child> <child>
<widget class="GtkScrolledWindow" id="Plugins.Additional.Scrolled"> <widget class="GtkScrolledWindow" id="Plugins.Additional.Scrolled">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child> <child>
<widget class="GtkTreeView" id="Plugins.Additional.TreeView"> <widget class="GtkTreeView" id="Plugins.Additional.TreeView">
<property name="width_request">300</property> <property name="width_request">300</property>
<property name="height_request">100</property> <property name="height_request">100</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child> </child>
<child> <child>
<widget class="GtkVButtonBox" id="Plugins.Additional.VButtonBox"> <widget class="GtkVButtonBox" id="Plugins.Additional.VButtonBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="spacing">4</property>
<property name="layout_style">GTK_BUTTONBOX_START</property> <property name="layout_style">GTK_BUTTONBOX_START</property>
<property name="spacing">4</property>
<child> <child>
<widget class="GtkButton" id="Plugins.Add"> <widget class="GtkButton" id="Plugins.Add">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-add</property> <property name="label">gtk-add</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkButton" id="Plugins.Remove"> <widget class="GtkButton" id="Plugins.Remove">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-remove</property> <property name="label">gtk-remove</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget> </widget>
<packing>
<property name="position">1</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="padding">3</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">3</property>
<property name="pack_type">GTK_PACK_END</property> <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="Plugins.Additional.Label"> <widget class="GtkLabel" id="Plugins.Additional.Label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">&lt;b&gt;Additional Plugin Directories&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Additional Plugin Directories&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</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">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> </widget>
<packing> <packing>
<property name="type">label_item</property> <property name="type">label_item</property>
@ -158,154 +276,244 @@
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">1</property> <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing> </packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="tab_expand">False</property> <property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="Plugins.Label"> <widget class="GtkLabel" id="Plugins.Label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">Plugins</property> <property name="label" translatable="yes">Plugins</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</property>
<property name="yalign">0</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> </widget>
<packing> <packing>
<property name="type">tab</property> <property name="type">tab</property>
<property name="tab_expand">False</property>
<property name="tab_fill">False</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkVBox" id="Policies.VBox"> <widget class="GtkVBox" id="Policies.VBox">
<property name="visible">True</property>
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<widget class="GtkFrame" id="Policies.Loaded.Frame"> <widget class="GtkFrame" id="Policies.Loaded.Frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label_xalign">0,000000</property> <property name="label_xalign">0</property>
<property name="label_yalign">0,000000</property> <property name="label_yalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkAlignment" id="Policies.Loaded.Alignment"> <widget class="GtkAlignment" id="Policies.Loaded.Alignment">
<property name="visible">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="xalign">0,000000</property> <property name="visible">True</property>
<property name="yalign">0,000000</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="left_padding">12</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkScrolledWindow" id="Policies.Loaded.ScrolledWindow"> <widget class="GtkScrolledWindow" id="Policies.Loaded.ScrolledWindow">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child> <child>
<widget class="GtkTreeView" id="Policies.Loaded.TreeView"> <widget class="GtkTreeView" id="Policies.Loaded.TreeView">
<property name="height_request">200</property> <property name="height_request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> </widget>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="Policies.Loaded.Label"> <widget class="GtkLabel" id="Policies.Loaded.Label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">&lt;b&gt;Loaded Policies&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Loaded Policies&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</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">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> </widget>
<packing> <packing>
<property name="type">label_item</property> <property name="type">label_item</property>
</packing> </packing>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child> </child>
<child> <child>
<widget class="GtkFrame" id="Policies.Additional.Frame"> <widget class="GtkFrame" id="Policies.Additional.Frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label_xalign">0,000000</property> <property name="label_xalign">0</property>
<property name="label_yalign">0,000000</property> <property name="label_yalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkAlignment" id="Policies.Additional.Alignment"> <widget class="GtkAlignment" id="Policies.Additional.Alignment">
<property name="visible">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="xalign">0,000000</property> <property name="visible">True</property>
<property name="yalign">0,000000</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="left_padding">12</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkHBox" id="Policies.Additional.HBox"> <widget class="GtkHBox" id="Policies.Additional.HBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">10</property> <property name="spacing">10</property>
<child> <child>
<widget class="GtkScrolledWindow" id="Policies.Additional.ScrolledWindow"> <widget class="GtkScrolledWindow" id="Policies.Additional.ScrolledWindow">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child> <child>
<widget class="GtkTreeView" id="Policies.Additional.TreeView"> <widget class="GtkTreeView" id="Policies.Additional.TreeView">
<property name="width_request">300</property> <property name="width_request">300</property>
<property name="height_request">100</property> <property name="height_request">100</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child> </child>
<child> <child>
<widget class="GtkVButtonBox" id="Policies.Additional.VButtonBox"> <widget class="GtkVButtonBox" id="Policies.Additional.VButtonBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="spacing">4</property>
<property name="layout_style">GTK_BUTTONBOX_START</property> <property name="layout_style">GTK_BUTTONBOX_START</property>
<property name="spacing">4</property>
<child> <child>
<widget class="GtkButton" id="Policies.Add"> <widget class="GtkButton" id="Policies.Add">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-add</property> <property name="label">gtk-add</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkButton" id="Policies.Remove"> <widget class="GtkButton" id="Policies.Remove">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="can_default">True</property> <property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-remove</property> <property name="label">gtk-remove</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
</widget> </widget>
<packing>
<property name="position">1</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="padding">3</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">3</property>
<property name="pack_type">GTK_PACK_END</property> <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="Policies.Additional.Label"> <widget class="GtkLabel" id="Policies.Additional.Label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">&lt;b&gt;Additional Policies Directories&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Additional Policies Directories&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</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">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> </widget>
<packing> <packing>
<property name="type">label_item</property> <property name="type">label_item</property>
@ -313,85 +521,138 @@
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">1</property> <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing> </packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">1</property>
<property name="tab_expand">False</property> <property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="Policies.Label"> <widget class="GtkLabel" id="Policies.Label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">Policies</property> <property name="label" translatable="yes">Policies</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</property>
<property name="yalign">0</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> </widget>
<packing> <packing>
<property name="type">tab</property> <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_expand">False</property>
<property name="tab_fill">False</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkVBox" id="Speed.VBox"> <widget class="GtkVBox" id="Speed.VBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child> <child>
<widget class="GtkFrame" id="Speed.Frame"> <widget class="GtkFrame" id="Speed.Frame">
<property name="visible">True</property>
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="label_xalign">0,000000</property> <property name="visible">True</property>
<property name="label_yalign">0,000000</property> <property name="label_xalign">0</property>
<property name="label_yalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property> <property name="shadow_type">GTK_SHADOW_NONE</property>
<child> <child>
<widget class="GtkAlignment" id="Speed.Alignment"> <widget class="GtkAlignment" id="Speed.Alignment">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property> <property name="xalign">0</property>
<property name="yalign">0,000000</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="left_padding">12</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkHBox" id="Speed.HBox"> <widget class="GtkHBox" id="Speed.HBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child> <child>
<widget class="GtkLabel" id="Speed.Description"> <widget class="GtkLabel" id="Speed.Description">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">Simulation step speed (milliseconds)</property> <property name="label" translatable="yes">Simulation step speed (milliseconds)</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</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_END</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget> </widget>
<packing> <packing>
<property name="fill">False</property> <property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkSpinButton" id="Speed.SpinButton"> <widget class="GtkSpinButton" id="Speed.SpinButton">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="adjustment">1000 0 9999 100 500 0</property>
<property name="climb_rate">2</property> <property name="climb_rate">2</property>
<property name="snap_to_ticks">True</property> <property name="digits">0</property>
<property name="numeric">True</property> <property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_IF_VALID</property> <property name="update_policy">GTK_UPDATE_IF_VALID</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
<property name="adjustment">1200 1 9999 50 500 0</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="Speed.Setting.Label"> <widget class="GtkLabel" id="Speed.Setting.Label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">&lt;b&gt;Simulation speed&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Simulation speed&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</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">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> </widget>
<packing> <packing>
<property name="type">label_item</property> <property name="type">label_item</property>
@ -399,57 +660,49 @@
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
</packing> </packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">2</property>
<property name="tab_expand">False</property> <property name="tab_expand">False</property>
<property name="tab_fill">True</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="Speed.Label"> <widget class="GtkLabel" id="Speed.Label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0,000000</property>
<property name="yalign">0,000000</property>
<property name="label" translatable="yes">Speed</property> <property name="label" translatable="yes">Speed</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</property>
<property name="yalign">0</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> </widget>
<packing> <packing>
<property name="type">tab</property> <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_expand">False</property>
<property name="tab_fill">False</property>
</packing> </packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="position">2</property> <property name="padding">0</property>
</packing> <property name="expand">True</property>
</child> <property name="fill">True</property>
<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="Close">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="response_id">-7</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing> </packing>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</glade-interface> </glade-interface>

3
src/backend/cpu_policies_gatekeeper.cc
View File

@ -23,6 +23,7 @@
#include "cpu_policies_gatekeeper.hh" #include "cpu_policies_gatekeeper.hh"
#include "cpu_policy_manager.hh" #include "cpu_policy_manager.hh"
#include "cpu_policy.hh" #include "cpu_policy.hh"
#include "concrete_history.hh"
// Include full template definition only in implementation files: // Include full template definition only in implementation files:
#include "singleton.tcc" #include "singleton.tcc"
@ -120,6 +121,8 @@ CPUPoliciesGatekeeper::activate_policy(History *history, CPUPolicy* policy) thro
{ {
policy->activate(); policy->activate();
_active_policies[history] = policy; _active_policies[history] = policy;
// the content of history (if any) is not vaild any more.
dynamic_cast<ConcreteHistory*>(history)->reset(true);
} }
catch(const CPUPolicyException& e) catch(const CPUPolicyException& e)
{ {

3
src/backend/resource_policies_gatekeeper.cc
View File

@ -23,6 +23,7 @@
#include "resource_policies_gatekeeper.hh" #include "resource_policies_gatekeeper.hh"
#include "resource_policy_manager.hh" #include "resource_policy_manager.hh"
#include "resource_policy.hh" #include "resource_policy.hh"
#include "concrete_history.hh"
// Include full template definition only in implementation files: // Include full template definition only in implementation files:
#include "singleton.tcc" #include "singleton.tcc"
@ -94,6 +95,8 @@ ResourcePoliciesGatekeeper::activate_policy(History *history, ResourcePolicy* po
assert(history != NULL && policy != NULL); assert(history != NULL && policy != NULL);
_active_policies[history] = policy; _active_policies[history] = policy;
// the content of history (if any) is not vaild any more.
dynamic_cast<ConcreteHistory*>(history)->reset(true);
} }
ResourcePoliciesGatekeeper::ResourcePoliciesGatekeeper() ResourcePoliciesGatekeeper::ResourcePoliciesGatekeeper()

10
src/graphical_preferences_editor.cc
View File

@ -49,6 +49,7 @@ PreferencesEditor::PreferencesEditor(const std::string& gladefile)
// ======================================== // ========================================
// PLUGINS // PLUGINS
@ -70,8 +71,11 @@ PreferencesEditor::PreferencesEditor(const std::string& gladefile)
_refXml->get_widget("Plugins.Loaded.TreeView", plugins_treeview); _refXml->get_widget("Plugins.Loaded.TreeView", plugins_treeview);
plugins_treeview->set_model(plugins_model); plugins_treeview->set_model(plugins_model);
plugins_treeview->append_column("name", column_name_plug); plugins_treeview->append_column("name", column_name_plug);
plugins_treeview->get_column_cell_renderer(0)->property_yalign().set_value(0.0);
plugins_treeview->append_column("description", column_desc_plug); plugins_treeview->append_column("description", column_desc_plug);
plugins_treeview->get_column_cell_renderer(1)->property_yalign().set_value(0.0);
plugins_treeview->append_column("author", column_author_plug); plugins_treeview->append_column("author", column_author_plug);
plugins_treeview->get_column_cell_renderer(2)->property_yalign().set_value(0.0);
// update the model with the backend information // update the model with the backend information
update_plugins(); update_plugins();
@ -123,6 +127,7 @@ PreferencesEditor::PreferencesEditor(const std::string& gladefile)
// ======================================== // ========================================
// POLICIES // POLICIES
@ -142,7 +147,10 @@ PreferencesEditor::PreferencesEditor(const std::string& gladefile)
_refXml->get_widget("Policies.Loaded.TreeView", policies_treeview); _refXml->get_widget("Policies.Loaded.TreeView", policies_treeview);
policies_treeview->set_model(policies_model); policies_treeview->set_model(policies_model);
policies_treeview->append_column("name", column_name_pol); policies_treeview->append_column("name", column_name_pol);
policies_treeview->get_column_cell_renderer(0)->property_yalign().set_value(0.0);
policies_treeview->append_column("description", column_desc_pol); policies_treeview->append_column("description", column_desc_pol);
policies_treeview->get_column_cell_renderer(1)->property_yalign().set_value(0.0);
// update the model with the backend information // update the model with the backend information
update_policies(); update_policies();
@ -194,6 +202,7 @@ PreferencesEditor::PreferencesEditor(const std::string& gladefile)
// ======================================== // ========================================
// SPEED // SPEED
@ -205,6 +214,7 @@ PreferencesEditor::PreferencesEditor(const std::string& gladefile)
// ======================================== // ========================================
// GENERAL // GENERAL

51
src/testsuite/scheduling-wizards/wizard-assert-fail
View File

@ -1,54 +1,5 @@
set cpu-policy 3 set cpu-policy 3
add resource
forchetta
1
add process
Scuola di Mileto
0
0
add thread 1
Anassimandro
3
0
0
add thread 1
Anassimene
2
2
0
add thread 1
Eraclito
2
2
0
add request 1 1
1
add subrequest 1 1 1
0
3
add request 1 1
2
add subrequest 1 1 2
0
2
add request 1 2
0
add subrequest 1 2 1
0
1
add request 1 3
0
add subrequest 1 3 1
0
1
load environments/ScuolaDiMileto_assert_fail.xgp
run run

53
src/testsuite/scheduling-wizards/wizard-block-fail
View File

@ -1,56 +1,5 @@
set cpu-policy 3 set cpu-policy 3
add resource
ashi
2
add resource
forchetta
1
add process
Scuola di Mileto
0
0
add thread 1
Anassimandro
4
0
0
add thread 1
Anassimene
6
1
0
add thread 1
Pitagora
2
1
0
add request 1 1
0
add subrequest 1 1 1
1
4
add request 1 1
2
add subrequest 1 1 2
1
3
add request 1 2
0
add subrequest 1 2 1
1
2
add request 1 3
0
add subrequest 1 3 1
1
2
load environments/ScuolaDiMileto_block_fail.xgp
run run

209
src/testsuite/scheduling-wizards/wizard-complex-test
View File

@ -1,212 +1,5 @@
set cpu-policy 2 set cpu-policy 2
add resource load environments/FruitsBasket_complex.xgp
forchetta
1
add resource
ashi
2
add resource
dita
10
add process (name, arrival time, base priority)
Toru
1
3
add thread 1 (name, required cput time, arrival time, base priority)
toru-kun
4
0
3
add process (name, arrival time, base priority)
Yuki
4
2
add thread 2 (name, required cput time, arrival time, base priority)
yun-yun
3
0
2
add process (name, arrival time, base priority)
Kyo
4
4
add thread 3 (name, required cput time, arrival time, base priority)
kyon-kyon
1
0
4
add process (name, arrival time, base priority)
Shigure
6
0
add thread 4 (name, required cput time, arrival time, base priority)
gure
1
0
0
add request 4 1
0
add subrequest 4 1 1
0
1
add subrequest 4 1 1
2
3
add subrequest 4 1 1
2
4
add process (name, arrival time, base priority)
Kagura
6
5
add thread 5 (name, required cput time, arrival time, base priority)
kagura
10
0
5
add request 5 1
0
add subrequest 5 1 1
0
5
add subrequest 5 1 1
2
3
add request 5 1
5
add subrequest 5 1 2
2
3
add subrequest 5 1 2
2
3
add process (name, arrival time, base priority)
Momiji
12
0
add thread 6 (name, required cput time, arrival time, base priority)
momiji-kun
1
0
0
add process (name, arrival time, base priority)
Hatori
14
0
add thread 7 (name, required cput time, arrival time, base priority)
tori
1
0
0
add process (name, arrival time, base priority)
Hatsuharu
15
0
add thread 8 (name, required cput time, arrival time, base priority)
haru
1
0
0
add process (name, arrival time, base priority)
Ayame
15
0
add thread 9 (name, required cput time, arrival time, base priority)
aya
6
0
0
add request 9 1
2
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add subrequest 9 1 1
2
3
add process (name, arrival time, base priority)
Kisa
17
0
add thread 10 (name, required cput time, arrival time, base priority)
kisa
2
0
0
add request 10 1
1
add subrequest 10 1 1
1
3
add subrequest 10 1 1
2
3
add process (name, arrival time, base priority)
Ritsu
16
0
add thread 11 (name, required cput time, arrival time, base priority)
ri
2
0
0
add request 11 1
0
add subrequest 11 1 1
0
1
run run

48
src/testsuite/scheduling-wizards/wizard-deadlock-test
View File

@ -4,52 +4,6 @@ configure-cpu-policy
0 0
1 1
add resource load environments/Matteo_deadlock.xgp
scythe
1
add resource
sword
1
add process
Antrophomorphic personification
0
0
add thread 1
Death
4
0
0
add thread 1
Susan Sto Helit
4
0
0
add request 1 1
0
add subrequest 1 1 1
0
2
add request 1 1
1
add subrequest 1 1 2
1
2
add request 1 2
0
add subrequest 1 2 1
1
2
add request 1 2
1
add subrequest 1 2 2
0
2
run run

48
src/testsuite/scheduling-wizards/wizard-gap-blocked
View File

@ -1,51 +1,5 @@
set cpu-policy 2 set cpu-policy 2
add resource load environments/ScuolaDiMileto_gap_blocked.xgp
forchetta
1
add process
Pitagorici
0
0
add thread 1
Pitagora
5
0
0
add request 1 1
0
add subrequest 1 1 1
0
5
add process
Scuola di Mileto
2
1
add thread 2
Anassimene
4
1
0
add thread 2
Anassimandro
2
0
0
add request 2 2
0
add subrequest 2 2 1
0
1
add subrequest 2 2 1
0
2
run run

67
src/testsuite/scheduling-wizards/wizard-gap-fail
View File

@ -1,69 +1,6 @@
set cpu-policy 3 set cpu-policy 3
add resource load environments/ScuolaDiMileto_gap_fail.xgp
forchetta
1
add process
Pitagorici
0
0
add thread 1
Pitagora
4
0
0
add request 1 1
0
add subrequest 1 1 1
0
4
add subrequest 1 1 1
0
4
add request 1 1
2
add subrequest 1 1 2
0
4
add process
Scuola di Mileto
3
0
add thread 2
Anassimene
6
0
0
add thread 2
Anassimandro
2
0
0
add request 2 1
0
add subrequest 2 1 1
0
2
add request 2 2
0
add subrequest 2 2 1
0
2
run run

27
src/testsuite/scheduling-wizards/wizard-gap-terminated
View File

@ -1,30 +1,5 @@
set cpu-policy 1 set cpu-policy 1
load environments/Modernita_gap_terminated.xgp
add process
Rivoluzione
0
1
add thread 1
Copernico
3
0
0
add thread 1
Bruno
2
3
0
add thread 1
Galilei
3
6
0
run run

53
src/testsuite/scheduling-wizards/wizard-priority-inversion-porno
View File

@ -29,58 +29,7 @@ configure-cpu-policy
1 1
1 1
add resource load environments/Porno_priority_inversion.xgp
Jenna Jameson
2
add process
"Wet Dreams IV"
0
0
add thread 1
Peter North
3
0
10
add request 1 1
0
add subrequest 1 1 1
0
3
add process
"A Night With Jenna"
2
0
add thread 2
Rocco Siffredi
3
0
0
add thread 2
Mandingo
3
0
5
add request 2 1
0
add subrequest 2 1 1
0
3
add subrequest 2 1 1
0
3
add request 2 2
0
add subrequest 2 2 1
0
3
run run

57
src/testsuite/scheduling-wizards/wizard-resource-lifo
View File

@ -4,61 +4,6 @@ configure-cpu-policy
0 0
2 2
add resource load environments/Fantozzi_lifo_requests.xgp
Telefono
1
add resource
Fax
1
add process
Ufficio Sinistri
0
5
add thread 1
Fantozzi
7
0
5
add request 1 1
0
add subrequest 1 1 1
0
7
add thread 1
Filini
3
2
4
add request 1 2
0
add subrequest 1 2 1
0
3
add subrequest 1 2 1
1
3
add thread 1
Signorina Silvani
4
4
3
add request 1 3
0
add subrequest 1 3 1
0
2
add subrequest 1 3 1
1
2
run run

33
src/testsuite/scheduling-wizards/wizard-unblock-test
View File

@ -4,38 +4,7 @@ configure-cpu-policy
0 0
1 1
add resource
banana
1
load environments/DiscWorld_unblock.xgp
add process
Unseen University
0
0
add thread 1
The Librarian
4
0
0
add thread 1
Rincewind
2
0
0
add request 1 1
0
add subrequest 1 1 1
0
3
add request 1 2
1
add subrequest 1 2 1
0
2
run run