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

* Drop libglademm dep, upgrade gtkmm dep to 2.12.1 and use

Browse source 
Gtkbuilder instead of Glade::XML
* Misc bugfixes



git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1326 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog 2008-11-08 18:35:13 +00:00
parent a40c636ba7
commit d704fc4b13
15 changed files with 375 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backend/scheduler.cc
View file

@ -1,4 +1,4 @@
// src/backend/scheduler.cc - Copyright 2005, 2006, University
// src/backend/scheduler.cc - Copyright 2005-2007 University
// of Padova, dept. of Pure and Applied
// Mathematics
//

11
src/parse_opts.cc
View file

@ -1,4 +1,4 @@
// src/parseopts.cc - Copyright 2005, 2006, University
// src/parseopts.cc - Copyright 2005-2007, University
// of Padova, dept. of Pure and Applied
// Mathematics
//
@ -98,14 +98,14 @@ parse_options(int argc, char** argv)
try
{
// Parse options, initialising the Gtk::Main at the same time
// Parse options, initialising the Gtk at the same time
gboolean gui_initializable = gtk_init_check(&argc, &argv);
context.parse(argc, argv);
GlobalPreferences& prefs = GlobalPreferences::get_instance();
try
{
prefs.load_configrc();
}
catch (std::exception e)
{
@ -131,7 +131,7 @@ parse_options(int argc, char** argv)
vector<CPUPolicyManager*> managers = CPUPoliciesGatekeeper::get_instance().get_registered();
if (no_gui_enabled)
if (no_gui_enabled || !gui_initializable)
{
// We don't return to main, instead we
// initialize the command line version
@ -154,10 +154,11 @@ parse_options(int argc, char** argv)
}
else
{
Gtk::Main main(argc, argv);
GuiBuilder* gui = new GuiBuilder();
if (fnames.begin() != fnames.end())
gui->open_file(*fnames.begin());
Gtk::Main::run(gui->get_initial_window());
main.run(gui->get_initial_window());
delete gui;
}

2
src/schedulables_tree_widget.cc
View file

@ -1,4 +1,4 @@
// src/schedulables_tree_widget.cc - Copyright 2005, 2006, University
// src/schedulables_tree_widget.cc - Copyright 2005-2007, University
// of Padova, dept. of Pure and Applied
// Mathematics
//

2
src/text_simulation.cc
View file

@ -1,4 +1,4 @@
// src/text_simulation.cc - Copyright 2005, 2006, University
// src/text_simulation.cc - Copyright 2005-2007, University
// of Padova, dept. of Pure and Applied
// Mathematics
//