Changeset 1869:52f5a7f9fb48 in lemon-0.x

Timestamp:

01/03/06 15:56:45 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2444

Message:

Handling of tabs is rationalized a bit. More than one file can be given at startup in command prompt. If there is no file given in command prompt, an empty tab will be present at startup.

Location:

gui

Files:

• graph-displayer.cc (modified) (1 diff)
• main_win.cc (modified) (4 diffs)
• nbtab.cc (modified) (2 diffs)

gui/graph-displayer.cc

@@ -64 +64 @@
   MainWin mytab;
 
-  if ((argc == 2) && (Glib::file_test(argv[1], Glib::FILE_TEST_IS_REGULAR)))
+//   if ((argc == 2) && (Glib::file_test(argv[1], Glib::FILE_TEST_IS_REGULAR)))
+//     {
+//       mytab.readFile(argv[1]);
+//     }
+  if(argc>=2)
     {
-      mytab.readFile(argv[1]);
+      for(int i=1;i<argc;i++)
+        {
+          if(Glib::file_test(argv[i], Glib::FILE_TEST_IS_REGULAR))
+            {
+              mytab.readFile(argv[i]);
+            }
+        }
+    }
+  else
+    {
+      mytab.newTab();
     }
   

gui/main_win.cc

@@ -73 +73 @@
 
   ag->add( Gtk::Action::create("FileMenu", "_File") );
-  ag->add( Gtk::Action::create("FileNewTab", "New _Tab"),
+  ag->add( Gtk::Action::create("FileNew", Gtk::Stock::NEW),
       sigc::mem_fun(*this, &MainWin::newTab));
-  ag->add( Gtk::Action::create("FileCloseTab", "_Close Tab"),
-      sigc::mem_fun(*this, &MainWin::closeTab));
-  ag->add( Gtk::Action::create("FileNew", Gtk::Stock::NEW),
-      sigc::mem_fun(*this, &MainWin::newFile));
   ag->add( Gtk::Action::create("FileOpen", Gtk::Stock::OPEN),
       sigc::mem_fun(*this, &MainWin::openFile));
+  ag->add( Gtk::Action::create("FileClearTab", "Clear Tab"),
+      sigc::mem_fun(*this, &MainWin::newFile));
   ag->add( Gtk::Action::create("FileSave", Gtk::Stock::SAVE),
       sigc::mem_fun(*this, &MainWin::saveFile));
@@ -86 +84 @@
       sigc::mem_fun(*this, &MainWin::saveFileAs));
   ag->add( Gtk::Action::create("Close", Gtk::Stock::CLOSE),
-      sigc::mem_fun(*this, &MainWin::close));
+      sigc::mem_fun(*this, &MainWin::closeTab));
   ag->add( Gtk::Action::create("Quit", Gtk::Stock::QUIT),
       sigc::mem_fun(*this, &MainWin::hide));
@@ -133 +131 @@
       "  <menubar name='MenuBar'>"
       "    <menu action='FileMenu'>"
-      "      <menuitem action='FileNewTab'/>"
-      "      <menuitem action='FileCloseTab'/>"
       "      <menuitem action='FileNew'/>"
       "      <menuitem action='FileOpen'/>"
+      "      <menuitem action='FileClearTab'/>"
       "      <menuitem action='FileSave'/>"
       "      <menuitem action='FileSaveAs'/>"
@@ -238 +235 @@
   if(active_tab!=-1)
     {
+      if (tabs[active_tab]->mapstorage.modified)
+        {
+          Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true, 
+                                     Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
+          mdialog.add_button("Close file _without Saving", Gtk::RESPONSE_REJECT);
+          mdialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+          mdialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+          switch (mdialog.run())
+            {
+            case Gtk::RESPONSE_CANCEL:
+              return;
+            case Gtk::RESPONSE_REJECT:
+              break;
+            case Gtk::RESPONSE_ACCEPT:
+              tabs[active_tab]->saveFile();
+              break;
+            }
+        }
       //tabs vector will be decreased with the deleted value
       int size=tabs.size();

gui/nbtab.cc

@@ -31 +31 @@
     Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true,
         Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
-    mdialog.add_button("Close _without Saving", Gtk::RESPONSE_REJECT);
+    mdialog.add_button("Close file _without Saving", Gtk::RESPONSE_REJECT);
     mdialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
     mdialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
@@ -60 +60 @@
     Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true, 
         Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
-    mdialog.add_button("Close _without Saving", Gtk::RESPONSE_REJECT);
+    mdialog.add_button("Close file _without Saving", Gtk::RESPONSE_REJECT);
     mdialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
     mdialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);