From 7bcc3b9eb4443c32101440bf3cd7206b51fee94f Mon Sep 17 00:00:00 2001 From: tchernobog Date: Sun, 20 Aug 2006 21:26:14 +0000 Subject: [PATCH] - Supersede old GUI in favor of a more clean (and hopefully clear) interface git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@918 3ecf2c5c-341e-0410-92b4-d18e462d057c --- glade/add-process-dialog.glade | 385 +++----- glade/add-request-dialog.glade | 735 ++++++--------- glade/add-resource-dialog.glade | 465 ++++----- glade/add-thread-dialog.glade | 464 ++++----- glade/configure-cpu-policy-dialog.glade | 169 ++-- glade/configure-dialog.glade | 1146 +++++++++-------------- glade/main-window.glade | 1004 ++++++++------------ src/backend/ready_queue.cc | 3 +- src/gui_builder.cc | 15 +- 9 files changed, 1742 insertions(+), 2644 deletions(-) diff --git a/glade/add-process-dialog.glade b/glade/add-process-dialog.glade index 9a696d6..d5b5fd8 100644 --- a/glade/add-process-dialog.glade +++ b/glade/add-process-dialog.glade @@ -1,235 +1,154 @@ - - - + + + - - - Add Process - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - True - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - 3 - 2 - False - 11 - 9 - - - - True - Name - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Base Priority - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Arrival Time - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - ● - False - 17 - - - 1 - 2 - 0 - 1 - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 inf 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 0 0 inf 1 10 10 - - - 1 - 2 - 2 - 3 - - - - - - 0 - True - True - - - - - - + + Add Process + False + True + GTK_WIN_POS_MOUSE + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + 6 + 3 + 2 + 9 + 11 + + + True + 0,000000 + 0,000000 + Name + + + GTK_FILL + + + + + + True + 0,000000 + 0,000000 + Base Priority + + + 2 + 3 + GTK_FILL + + + + + + True + 0,000000 + 0,000000 + Arrival Time + + + 1 + 2 + GTK_FILL + + + + + + True + True + ● + 17 + + + 1 + 2 + + + + + + True + True + 1,000000 1,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + 0,000000 0,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + 2 + 2 + 3 + + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + diff --git a/glade/add-request-dialog.glade b/glade/add-request-dialog.glade index 5892c48..a4037d9 100644 --- a/glade/add-request-dialog.glade +++ b/glade/add-request-dialog.glade @@ -1,443 +1,296 @@ - - - + + + - - - 0 - Add Request - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_SPREAD - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 4 - True - False - 6 - - - - True - False - 6 - - - - True - Instant - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 0 0 inf 1 10 10 - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - True - True - False - False - False - - - - - 0 - True - True - - - - - - True - 2 - 2 - False - 6 - 6 - - - - True - Duration - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Resource - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 inf 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - - True - False - True - - - 1 - 2 - 0 - 1 - fill - fill - - - - - 0 - False - False - - - - - - 6 - True - GTK_BUTTONBOX_SPREAD - 0 - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Add - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-remove - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Remove - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - + + 300 + 240 + Add Request + True + GTK_WIN_POS_MOUSE + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + 4 + 6 + + + True + 6 + + + True + 0,000000 + 0,000000 + Instant + + + False + False + + + + + True + True + 0,000000 0,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + + + + + False + False + + + + + True + True + GTK_POLICY_NEVER + GTK_SHADOW_IN + + + True + True + True + + + + + 1 + + + + + True + 2 + 2 + 6 + 6 + + + True + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + 0,000000 1,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + 2 + 1 + 2 + + + + + + True + 0,000000 + 0,000000 + Resource + + + GTK_FILL + + + + + + True + 0,000000 + 0,000000 + Duration + + + 1 + 2 + GTK_FILL + + + + + + False + False + 2 + + + + + True + 6 + GTK_BUTTONBOX_SPREAD + + + True + True + True + + + True + 0,000000 + 0,000000 + 0,000000 + 0,000000 + + + True + 2 + + + True + 0,000000 + 0,000000 + gtk-add + + + False + False + + + + + True + 0,000000 + 0,000000 + Add + True + + + False + False + 1 + + + + + + + + + + + True + True + True + + + True + 0,000000 + 0,000000 + 0,000000 + 0,000000 + + + True + 2 + + + True + 0,000000 + 0,000000 + gtk-remove + + + False + False + + + + + True + 0,000000 + 0,000000 + Remove + True + + + False + False + 1 + + + + + + + + + 1 + + + + + False + 3 + + + + + 2 + + + + + True + GTK_BUTTONBOX_SPREAD + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + diff --git a/glade/add-resource-dialog.glade b/glade/add-resource-dialog.glade index d7b1be1..2338c5e 100644 --- a/glade/add-resource-dialog.glade +++ b/glade/add-resource-dialog.glade @@ -1,285 +1,184 @@ - - - + + + - - - Add Resource - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - True - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - 4 - 2 - False - 11 - 9 - - - - True - Name - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - ● - False - 17 - - - 1 - 2 - 0 - 1 - - - - - - - True - Places - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 inf 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - - True - Availability - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 0 0 inf 1 10 10 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 3 - 4 - fill - - - - - - - True - Pre-emptable - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - 0 - True - True - - - - - - + + Add Resource + False + True + GTK_WIN_POS_MOUSE + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + 6 + 4 + 2 + 9 + 11 + + + True + 0,000000 + 0,000000 + Pre-emptable + + + 3 + 4 + GTK_FILL + + + + + + True + True + True + True + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + True + True + 0,000000 0,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + 2 + 2 + 3 + + + + + + True + 0,000000 + 0,000000 + Availability + + + 2 + 3 + GTK_FILL + + + + + + True + True + 0,000000 1,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + 2 + 1 + 2 + + + + + + True + 0,000000 + 0,000000 + Places + + + 1 + 2 + GTK_FILL + + + + + + True + True + ● + 17 + + + 1 + 2 + + + + + + True + 0,000000 + 0,000000 + Name + + + GTK_FILL + + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + diff --git a/glade/add-thread-dialog.glade b/glade/add-thread-dialog.glade index b5d5fe3..c19de68 100644 --- a/glade/add-thread-dialog.glade +++ b/glade/add-thread-dialog.glade @@ -1,284 +1,184 @@ - - - + + + - - - Add Thread - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - True - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - 4 - 2 - False - 11 - 9 - - - - True - Name - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - ● - False - 17 - - - 1 - 2 - 0 - 1 - - - - - - - True - Base Priority - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - Arrival Time - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Cpu Time - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 1 inf 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 0 0 inf 1 10 10 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 0 0 inf 1 10 10 - - - 1 - 2 - 3 - 4 - - - - - - 0 - True - True - - - - - - + + Add Thread + False + True + GTK_WIN_POS_MOUSE + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + 6 + 4 + 2 + 9 + 11 + + + True + True + 0,000000 0,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + 2 + 3 + 4 + + + + + + True + True + 0,000000 0,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + 2 + 2 + 3 + + + + + + True + True + 0,000000 1,000000 0,000000 1,000000 10,000000 10,000000 + 1 + True + + + 1 + 2 + 1 + 2 + + + + + + True + 0,000000 + 0,000000 + Cpu Time + + + 1 + 2 + GTK_FILL + + + + + + True + 0,000000 + 0,000000 + Arrival Time + + + 2 + 3 + GTK_FILL + + + + + + True + 0,000000 + 0,000000 + Base Priority + + + 3 + 4 + GTK_FILL + + + + + + True + True + ● + 17 + + + 1 + 2 + + + + + + True + 0,000000 + 0,000000 + Name + + + GTK_FILL + + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + diff --git a/glade/configure-cpu-policy-dialog.glade b/glade/configure-cpu-policy-dialog.glade index 4c26e07..245459f 100644 --- a/glade/configure-cpu-policy-dialog.glade +++ b/glade/configure-cpu-policy-dialog.glade @@ -1,101 +1,72 @@ - - - + + + - - - 0 - Configure the CPU Policy - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_SPREAD - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - + + 0 + Configure the CPU Policy + True + GTK_WIN_POS_MOUSE + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + True + GTK_SHADOW_IN + + + True + True + + + + + 2 + + + + + True + GTK_BUTTONBOX_SPREAD + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + diff --git a/glade/configure-dialog.glade b/glade/configure-dialog.glade index 39b3f5d..a8272cb 100644 --- a/glade/configure-dialog.glade +++ b/glade/configure-dialog.glade @@ -1,701 +1,449 @@ - - - + + + - - - 0 - SGPEMv2 Preferences - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - True - 500 - 300 - True - False - gtk-preferences - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - True - True - False - GTK_POS_TOP - False - False - - - - 5 - True - False - 5 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 6 - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - - - - - - True - <b>Loaded Plugins</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.479999989271 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 6 - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 10 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_START - 4 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - True - False - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - 3 - False - False - GTK_PACK_END - - - - - - - - - - True - <b>Additional Plugin Directories</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.479999989271 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - False - True - - - - - - True - Plugins - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 5 - True - False - 5 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 6 - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - - - - - - True - <b>Loaded Policies</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.479999989271 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 6 - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 10 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_START - 4 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - True - False - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - 3 - False - False - GTK_PACK_END - - - - - - - - - - True - <b>Additional Policies Directories</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.479999989271 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - False - True - - - - - - True - Policies - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - False - 0 - - - - 5 - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - True - Simulation step speed (milliseconds) - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - False - - - - - - True - True - 2 - 0 - True - GTK_UPDATE_IF_VALID - True - False - 1000 0 9999 100 500 500 - - - 0 - True - False - - - - - - - - - - True - <b>Simulation speed</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - False - True - - - - - - True - Speed - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - + + 0 + SGPEMv2 Preferences + True + GTK_WIN_POS_CENTER_ON_PARENT + 500 + 300 + gtk-preferences + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + True + False + + + True + 5 + 5 + + + True + 0,000000 + 0,000000 + GTK_SHADOW_NONE + + + True + 6 + 0,000000 + 0,000000 + 12 + + + True + True + GTK_SHADOW_IN + + + True + True + + + + + + + + + True + 0,000000 + 0,000000 + <b>Loaded Plugins</b> + True + + + label_item + + + + + + + True + 0,000000 + 0,000000 + GTK_SHADOW_NONE + + + True + 6 + 0,000000 + 0,000000 + 12 + + + True + 10 + + + True + True + GTK_SHADOW_IN + + + True + True + + + + + + + True + 4 + GTK_BUTTONBOX_START + + + True + True + True + gtk-add + True + + + + + True + False + True + True + gtk-remove + True + + + 1 + + + + + False + False + 3 + GTK_PACK_END + 1 + + + + + + + + + True + 0,000000 + 0,000000 + <b>Additional Plugin Directories</b> + True + + + label_item + + + + + 1 + + + + + False + + + + + True + 0,000000 + 0,000000 + Plugins + + + tab + False + False + + + + + True + 5 + 5 + + + True + 0,000000 + 0,000000 + GTK_SHADOW_NONE + + + True + 6 + 0,000000 + 0,000000 + 12 + + + True + True + GTK_SHADOW_IN + + + True + True + + + + + + + + + True + 0,000000 + 0,000000 + <b>Loaded Policies</b> + True + + + label_item + + + + + + + True + 0,000000 + 0,000000 + GTK_SHADOW_NONE + + + True + 6 + 0,000000 + 0,000000 + 12 + + + True + 10 + + + True + True + GTK_SHADOW_IN + + + True + True + + + + + + + True + 4 + GTK_BUTTONBOX_START + + + True + True + True + gtk-add + True + + + + + True + False + True + True + gtk-remove + True + + + 1 + + + + + False + False + 3 + GTK_PACK_END + 1 + + + + + + + + + True + 0,000000 + 0,000000 + <b>Additional Policies Directories</b> + True + + + label_item + + + + + 1 + + + + + 1 + False + + + + + True + 0,000000 + 0,000000 + Policies + + + tab + 1 + False + False + + + + + True + + + True + 5 + 0,000000 + 0,000000 + GTK_SHADOW_NONE + + + True + 0,000000 + 0,000000 + 12 + + + True + + + True + 0,000000 + 0,000000 + Simulation step speed (milliseconds) + + + False + + + + + True + True + 1000,000000 0,000000 9999,000000 100,000000 500,000000 500,000000 + 2 + True + True + GTK_UPDATE_IF_VALID + + + False + 1 + + + + + + + + + True + 0,000000 + 0,000000 + <b>Simulation speed</b> + True + + + label_item + + + + + False + False + + + + + 2 + False + + + + + True + 0,000000 + 0,000000 + Speed + + + tab + 2 + False + False + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + True + gtk-close + True + -7 + + + + + False + GTK_PACK_END + + + + + diff --git a/glade/main-window.glade b/glade/main-window.glade index ce01c35..5aac318 100644 --- a/glade/main-window.glade +++ b/glade/main-window.glade @@ -1,609 +1,417 @@ - - - + + + - - - Untitled - SGPEMv2 Ford Prefect - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 800 - 600 - True - False - gtk-dialog-warning - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR - - - - True - _File - True - - - - - - - True - gtk-open - True - - - - - - True - gtk-save - True - - - - - - True - gtk-save-as - True - - - - - - True - gtk-close - True - - - - - - True - - - - - - True - gtk-quit - True - - - - - - - - - - True - _Edit - True - - - - - - - True - gtk-preferences - True - - - - - - - - - - True - _Simulation - True - - - - - - - True - gtk-media-play - True - - - - - - True - gtk-media-pause - True - - - - - - True - gtk-media-stop - True - - - - - - - - - - - True - _Debug - True - - - - - - - True - gtk-dialog-error - True - - - - - - - - - - True - _Help - True - - - - - - - True - gtk-about - True - - - - - - - - - 0 - False - True - - - - - - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_BOTH - True - True - - - - True - gtk-open - True - True - False - - - False - True - - - - - - True - gtk-save - True - True - False - - - False - True - - - - - - True - True - True - True - - - False - False - - - - - - True - False - gtk-media-play - True - True - False - - - False - True - - - - - - True - False - gtk-media-pause - True - True - False - - - False - True - - - - - - True - False - gtk-media-stop - True - True - False - - - False - True - - - - - - True - True - True - True - - - False - False - - - - - - True - Scheduling Policy - True - gtk-convert - True - True - False - - - False - False - - - - - - True - True - True - True - - - False - False - - - - - - True - Resource Scheduling - True - gtk-select-color - True - True - False - - - False - False - - - - - 0 - False - True - - - - - - True - True - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - GTK_SHADOW_IN - - - - 3 - True - False - 0 - - - - True - True - True - 0 - - - - - - - - True - Schedulables - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - True - True - 0 - - - - - - - - True - Resources - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - True - False - 0 - - - - - - - - True - Requests - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - True - - - - - - - - - True - False - - - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - True - True - - - - - 0 - True - True - - - - - - True - True - - - 0 - False - True - GTK_PACK_END - - - - - - - - False - Application Name - University of Padova, dept. of Pure and Applied Mathematics - An educational simulator for process scheduling policies in a monoprocessor computer. - SGPEMv2 comes with ABSOLUTELY NO WARRANTY. This is free software, + + Untitled - SGPEMv2 Ford Prefect + 800 + 600 + gtk-dialog-warning + + + True + + + True + + + True + _File + True + + + + + True + gtk-open + True + True + + + + + True + gtk-save + True + True + + + + + True + gtk-save-as + True + True + + + + + True + gtk-close + True + True + + + + + True + + + + + True + gtk-quit + True + True + + + + + + + + + True + _Edit + True + + + + + True + gtk-preferences + True + True + + + + + + + + + True + _Simulation + True + + + + + True + gtk-media-play + True + True + + + + + True + gtk-media-pause + True + True + + + + + True + gtk-media-stop + True + True + + + + + + + + + + True + _Debug + True + + + + + True + gtk-dialog-error + True + True + + + + + + + + + True + _Help + True + + + + + True + gtk-about + True + True + + + + + + + + + False + + + + + True + GTK_TOOLBAR_BOTH + + + True + gtk-open + + + + + True + gtk-save + + + + + True + + + + + True + False + gtk-media-play + + + + + True + False + gtk-media-pause + + + + + True + False + gtk-media-stop + + + + + True + + + + + True + Scheduling Policy + True + gtk-convert + + + + + True + + + + + True + Resource Scheduling + True + gtk-select-color + + + + + False + 1 + + + + + True + True + 1 + 200 + + + True + + + True + 0,000000 + GTK_SHADOW_NONE + + + True + 12 + + + True + GTK_POLICY_AUTOMATIC + GTK_SHADOW_OUT + + + + + + + + + + True + 2 + <i>Schedulables</i> + True + + + label_item + + + + + 3 + + + + + True + 0,000000 + GTK_SHADOW_NONE + + + True + 12 + + + True + GTK_POLICY_AUTOMATIC + GTK_SHADOW_OUT + + + + + + + + + + True + 2 + <i>Resources</i> + True + + + label_item + + + + + 3 + 1 + + + + + False + + + + + True + True + GTK_POLICY_AUTOMATIC + + + + + + + + 2 + + + + + True + 0,100000 + 6 + <b>Ready queue: {</b> <b>}</b> + True + PANGO_ELLIPSIZE_END + True + + + False + 3 + 4 + + + + + True + + + False + GTK_PACK_END + 3 + + + + + + + University of Padova, dept. of Pure and Applied Mathematics + An educational simulator for process scheduling policies in a monoprocessor computer. + 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. - False - Giovanni Giacobbi <ggiacobb@studenti.math.unipd.it> + Giovanni Giacobbi <ggiacobb@studenti.math.unipd.it> Filippo Paparella <ironpipp@gmail.com> Paolo Santi <psanti@studenti.math.unipd.it> Matteo Settenvini <matteo@member.fsf.org> Marco Trevisan <mtrevisa@studenti.math.unipd.it> Djina Verbanac <betalgez@yahoo.com> Luca Vezzaro <lvezzaro@studenti.math.unipd.it> - - - - - - True - False - 12 - - - - - - - - True - GTK_BUTTONBOX_END - - - 0 - False - True - GTK_PACK_END - - - - - - + + + + True + 12 + + + + + + True + GTK_BUTTONBOX_END + + + False + GTK_PACK_END + + + + + diff --git a/src/backend/ready_queue.cc b/src/backend/ready_queue.cc index de52d77..eba81d6 100644 --- a/src/backend/ready_queue.cc +++ b/src/backend/ready_queue.cc @@ -75,4 +75,5 @@ void ReadyQueue::erase_first() { _scheds.erase(_scheds.begin()); -} \ No newline at end of file +} + diff --git a/src/gui_builder.cc b/src/gui_builder.cc index 1e0d6f2..160a88b 100644 --- a/src/gui_builder.cc +++ b/src/gui_builder.cc @@ -246,19 +246,17 @@ GuiBuilder::GuiBuilder(const std::string& gladefile) // Temporary code to test the Schedulables custom widget - Expander* scheds_expander = NULL; - _refXml->get_widget("SchedulablesExpander", scheds_expander); + ScrolledWindow* schedulables_sw = NULL; + _refXml->get_widget("SchedulablesScrolledWindow", schedulables_sw); - SchedulablesTreeWidget* scheds_widget = manage(new SchedulablesTreeWidget()); - scheds_expander->add(*scheds_widget); + SchedulablesTreeWidget* scheds_tree = manage(new SchedulablesTreeWidget()); + schedulables_sw->add(*scheds_tree); // we have to remember to manually show custom added widgets: - scheds_widget->show(); + scheds_tree->show(); - - // Main simulation widget - + // Main simulation widget ScrolledWindow* simulation_window = NULL; _refXml->get_widget("SimulationScrolledWindow", simulation_window); _simulation_widget = new SimulationWidget(); @@ -289,3 +287,4 @@ GuiBuilder::open_file(const std::string& filename) // Debug line (erase me when done): std::cout << _("Filename to open: ") << filename << std::endl; } +