Changeset 201:879e47e5b731 in glemon-0.x for main_win.cc

Timestamp:

01/02/08 22:03:09 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3431

Message:

Merge branches/akos to trunk.

File:

• main_win.cc (modified) (7 diffs)

main_win.cc

@@ -21 +21 @@
 #endif
 
-#include <main_win.h>
-#include <guipixbufs.h>
-#include <background_chooser_dialog.h>
+#include "main_win.h"
+#include "guipixbufs.h"
+#include "save_details_dialog.h"
+#include "background_chooser_dialog.h"
 
 #include <mapstorage.h>
@@ -115 +116 @@
   ag->add( Gtk::Action::create("FileSaveAs", Gtk::Stock::SAVE_AS),
       sigc::mem_fun(*this, &MainWin::saveFileAs));
+  ag->add( Gtk::Action::create("SaveDetails", _("Save _Details...")),
+           sigc::mem_fun(*this, &MainWin::createSaveDetailsDialog));
   ag->add( Gtk::Action::create("Close", Gtk::Stock::CLOSE),
       sigc::mem_fun(*this, &MainWin::closeTab));
@@ -161 +164 @@
       sigc::bind( sigc::mem_fun ( *this, &MainWin::changeEditorialTool ), 4) );
 
-  ag->add( Gtk::Action::create("AddMap", Gtk::StockID("gd-newmap")),
+  ag->add( Gtk::Action::create("AddMap", Gtk::StockID("gd-newmap"), "New map"),
       sigc::mem_fun ( *this , &MainWin::createNewMapWin ) );
 
@@ -167 +170 @@
       sigc::mem_fun ( *this , &MainWin::reDesignGraph ) );
 
-  ag->add( Gtk::Action::create("Eps", Gtk::StockID("gd-eps")),
+  ag->add( Gtk::Action::create("Eps", Gtk::StockID("gd-eps"), "Export to EPS"),
       sigc::mem_fun ( *this , &MainWin::exportToEPS ) );
 
@@ -186 +189 @@
       "      <menuitem action='FileSave'/>"
       "      <menuitem action='FileSaveAs'/>"
+      "      <menuitem action='SaveDetails'/>"
       "      <menuitem action='Close'/>"
       "      <menuitem action='Quit'/>"
@@ -371 +375 @@
   if(active_tab!=-1)
     {
-      if (tabs[active_tab]->mapstorage->modified)
+      if (tabs[active_tab]->mapstorage->getModified())
         {
           Gtk::MessageDialog mdialog(_("<b>Save changes before closing?</b>"), true, 
@@ -629 +633 @@
 }
 
+void MainWin::createSaveDetailsDialog()
+{
+  SaveDetailsDialog dialog(tabs[active_tab]->mapstorage);
+  dialog.run();
+}
+
 void MainWin::exportToEPS()
 {