diff --git a/Makefile.am b/Makefile.am index 99b949a..e15a324 100644 --- a/Makefile.am +++ b/Makefile.am @@ -320,6 +320,7 @@ noinst_HEADERS += \ # ---------- glade files ----------- glade_DATA = \ + data/logo.png \ glade/add-process-dialog.glade \ glade/add-request-dialog.glade \ glade/add-resource-dialog.glade \ diff --git a/data/example-snaphot.xsgp b/data/example-snapshot.xsgp similarity index 100% rename from data/example-snaphot.xsgp rename to data/example-snapshot.xsgp diff --git a/data/logo.png b/data/logo.png new file mode 100644 index 0000000..df11e79 Binary files /dev/null and b/data/logo.png differ diff --git a/glade/main-window.glade b/glade/main-window.glade index 5aac318..a6d4bb8 100644 --- a/glade/main-window.glade +++ b/glade/main-window.glade @@ -2,13 +2,13 @@ - Untitled - SGPEMv2 Ford Prefect + SGPEMv2 800 600 gtk-dialog-warning @@ -253,7 +253,7 @@ 1 200 - + True @@ -289,7 +289,7 @@ - 3 + False @@ -326,13 +326,13 @@ - 3 - 1 + False False + False @@ -354,7 +354,8 @@ True 0,100000 - 6 + 7 + 2 <b>Ready queue: {</b> <b>}</b> True PANGO_ELLIPSIZE_END @@ -362,7 +363,6 @@ False - 3 4 @@ -380,12 +380,11 @@ + MainWindow + 0.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. + 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. Giovanni Giacobbi <ggiacobb@studenti.math.unipd.it> Filippo Paparella <ironpipp@gmail.com> Paolo Santi <psanti@studenti.math.unipd.it> @@ -395,14 +394,14 @@ Djina Verbanac <betalgez@yahoo.com> Luca Vezzaro <lvezzaro@studenti.math.unipd.it> - + True 12 - + True GTK_BUTTONBOX_END diff --git a/src/gui_builder.cc b/src/gui_builder.cc index 160a88b..e886ce3 100644 --- a/src/gui_builder.cc +++ b/src/gui_builder.cc @@ -33,11 +33,11 @@ #include "backend/serializers_gatekeeper.hh" #include "backend/serializer.hh" +#include #include #include #include #include -#include #include #include #include @@ -222,19 +222,19 @@ GuiBuilder::GuiBuilder(const std::string& gladefile) file_quit->signal_activate().connect(sigc::ptr_fun(&Main::quit)); // preferences dialog - MenuItem* edit_preferences = NULL; + MenuItem* edit_preferences; _refXml->get_widget("MenuItem.Edit.Preferences", edit_preferences); edit_preferences->signal_activate().connect(sigc::mem_fun(*this, &GuiBuilder::on_edit_preferences_activate)); // About dialog - MenuItem* help_about = NULL; + MenuItem* help_about; _refXml->get_widget("MenuItem.Help.About", help_about); AboutDialog* about_dialog = NULL; _refXml->get_widget("AboutDialog", about_dialog); help_about->signal_activate().connect(sigc::mem_fun(*about_dialog, &Window::show)); - - + about_dialog->set_wrap_license(true); + about_dialog->set_logo(Gdk::Pixbuf::create_from_file(GLADEDIR "/logo.png")); // Random Error Generator