- Some little improvements to interface (use HPaned instead of HBox)

- Add logo to AboutDialog :-)


git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@919 3ecf2c5c-341e-0410-92b4-d18e462d057c

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 \

glade/main-window.glade

@@ -2,13 +2,13 @@
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
 <!-- Generated with glade3
 	Version: 3.0.0
-	Date: Sun Aug 20 23:32:42 2006
+	Date: Mon Aug 21 00:18:03 2006
 	User: matteo
 	Host: tulip
 -->
 <glade-interface>
   <widget class="GtkWindow" id="MainWindow">
-    <property name="title">Untitled - SGPEMv2 Ford Prefect</property>
+    <property name="title">SGPEMv2</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
     <property name="icon_name">gtk-dialog-warning</property>
@@ -253,7 +253,7 @@
             <property name="border_width">1</property>
             <property name="position">200</property>
             <child>
-              <widget class="GtkHBox" id="EntitiesHBox">
+              <widget class="GtkHPaned" id="EntitiesHPaned">
                 <property name="visible">True</property>
                 <child>
                   <widget class="GtkFrame" id="SchedulablesFrame">
@@ -289,7 +289,7 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="padding">3</property>
+                    <property name="resize">False</property>
                   </packing>
                 </child>
                 <child>
@@ -326,13 +326,13 @@
                     </child>
                   </widget>
                   <packing>
-                    <property name="padding">3</property>
+                    <property name="resize">False</property>
-                    <property name="position">1</property>
                   </packing>
                 </child>
               </widget>
               <packing>
                 <property name="resize">False</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
             <child>
@@ -354,7 +354,8 @@
           <widget class="GtkLabel" id="ReadyQueueLabel">
             <property name="visible">True</property>
             <property name="xalign">0,100000</property>
-            <property name="xpad">6</property>
+            <property name="xpad">7</property>
+            <property name="ypad">2</property>
             <property name="label" translatable="yes">&lt;b&gt;Ready queue: {&lt;/b&gt; &lt;b&gt;}&lt;/b&gt;</property>
             <property name="use_markup">True</property>
             <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
@@ -362,7 +363,6 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="padding">3</property>
             <property name="position">4</property>
           </packing>
         </child>
@@ -380,12 +380,11 @@
     </child>
   </widget>
   <widget class="GtkAboutDialog" id="AboutDialog">
+    <property name="transient_for">MainWindow</property>
+    <property name="version">0.3</property>
     <property name="copyright">University of Padova, dept. of Pure and Applied Mathematics</property>
     <property name="comments">An educational simulator for process scheduling policies in a monoprocessor computer.</property>
-    <property name="license">SGPEMv2 comes with ABSOLUTELY NO WARRANTY. This is free software, 
+    <property name="license">SGPEMv2 comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under the terms of the GNU General Public License; for details see file COPYING contained in the source package.</property>
-  and you are welcome to redistribute it under the terms of the GNU General 
-  Public License; for details see file COPYING contained in the source 
-  package.</property>
     <property name="authors">Giovanni Giacobbi &lt;ggiacobb@studenti.math.unipd.it&gt;
 Filippo Paparella &lt;ironpipp@gmail.com&gt;
 Paolo Santi       &lt;psanti@studenti.math.unipd.it&gt;
@@ -395,14 +394,14 @@ Djina Verbanac    &lt;betalgez@yahoo.com&gt;
 Luca Vezzaro      &lt;lvezzaro@studenti.math.unipd.it&gt;</property>
     <property name="documenters"></property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+      <widget class="GtkVBox" id="AboutDialog.VBox">
         <property name="visible">True</property>
         <property name="spacing">12</property>
         <child>
           <placeholder/>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <widget class="GtkHButtonBox" id="AboutDialog.ActionArea">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
           </widget>

src/gui_builder.cc

@@ -33,11 +33,11 @@
 #include "backend/serializers_gatekeeper.hh"
 #include "backend/serializer.hh"
 
+#include <gdkmm/pixbuf.h>
 #include <glibmm/ustring.h>
 #include <gtkmm/aboutdialog.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/filechooserdialog.h>
-#include <gtkmm/expander.h>
 #include <gtkmm/main.h>
 #include <gtkmm/menuitem.h>
 #include <gtkmm/scrolledwindow.h>
@@ -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