1.1 --- a/nbtab.cc Thu Mar 01 08:07:39 2007 +0000
1.2 +++ b/nbtab.cc Thu Mar 01 13:33:46 2007 +0000
1.3 @@ -53,7 +53,7 @@
1.4 {
1.5 mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
1.6 }
1.7 - signal_title.emit(Glib::filename_display_basename(file));
1.8 + title_changed(Glib::filename_display_basename(file));
1.9 }
1.10
1.11 void NoteBookTab::newFile()
1.12 @@ -82,7 +82,7 @@
1.13 {
1.14 mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
1.15 }
1.16 - signal_title.emit("unsaved file");
1.17 + title_changed("unsaved file");
1.18 }
1.19
1.20 void NoteBookTab::openFile()
1.21 @@ -122,7 +122,7 @@
1.22 {
1.23 mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
1.24 }
1.25 - signal_title.emit(Glib::filename_display_basename(filename));
1.26 + title_changed(Glib::filename_display_basename(filename));
1.27 }
1.28 }
1.29 }
1.30 @@ -136,7 +136,7 @@
1.31 {
1.32 mapstorage->writeToFile(mapstorage->file_name);
1.33 mapstorage->modified = false;
1.34 - signal_title.emit(Glib::filename_display_basename(mapstorage->file_name));
1.35 + title_changed(Glib::filename_display_basename(mapstorage->file_name));
1.36 }
1.37 }
1.38
1.39 @@ -151,7 +151,7 @@
1.40 mapstorage->file_name = filename;
1.41 mapstorage->writeToFile(filename);
1.42 mapstorage->modified = false;
1.43 - signal_title.emit(Glib::filename_display_basename(filename));
1.44 + title_changed(Glib::filename_display_basename(filename));
1.45 }
1.46 }
1.47
1.48 @@ -181,7 +181,7 @@
1.49 {
1.50 mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
1.51 }
1.52 - signal_title.emit("unsaved file");
1.53 + title_changed("unsaved file");
1.54 }
1.55
1.56 void NoteBookTab::propertyChange(bool itisedge, int prop, std::string mapname)
1.57 @@ -240,9 +240,11 @@
1.58 {
1.59 if(!epswinexists)
1.60 {
1.61 - epswin=new EpsWin("Export to EPS - "+name, *this);
1.62 + epswin=new EpsWin("Export to EPS - "+name);
1.63 epswin->show();
1.64 epswinexists=true;
1.65 + epswin->signal_eps_details_ch().connect(sigc::mem_fun(*this, &NoteBookTab::exportGraphToEPS));
1.66 + epswin->signal_eps_close_ch().connect(sigc::mem_fun(*this, &NoteBookTab::closeEpsWin));
1.67 }
1.68 }
1.69
1.70 @@ -254,7 +256,7 @@
1.71 double attraction, propulsation;
1.72 int iterations;
1.73 mapstorage->get_design_data(attraction, propulsation, iterations);
1.74 - designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations, *this);
1.75 + designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations);
1.76
1.77 designwin->signal_attraction().connect(sigc::mem_fun(mapstorage, &MapStorage::set_attraction));
1.78 designwin->signal_propulsation().connect(sigc::mem_fun(mapstorage, &MapStorage::set_propulsation));
1.79 @@ -322,3 +324,16 @@
1.80 {
1.81 mapstorage->exportGraphToEPS(options, filename);
1.82 }
1.83 +
1.84 +void NoteBookTab::title_changed(std::string newtitle)
1.85 +{
1.86 + signal_title.emit(newtitle);
1.87 + if(epswinexists)
1.88 + {
1.89 + epswin->set_title(newtitle);
1.90 + }
1.91 + if(designwinexists)
1.92 + {
1.93 + designwin->set_title(newtitle);
1.94 + }
1.95 +}