removed shift/reduce conflict

[wxWidgets.git] / src / common / docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 072766bb9a90b33ba3b42e6f7d1b7b4e74e4bad4..a49ef09a9bfa5a1cabe68d4425f24bb8ad2b656b 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1386,7 +1386,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
                 msgTitle = wxTheApp->GetAppName();
             else
                 msgTitle = wxString(_("File error"));
                 msgTitle = wxTheApp->GetAppName();
             else
                 msgTitle = wxString(_("File error"));

-            
+

             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 
             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 


@@ -1437,63 +1437,94 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates)
 {
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates)
 {

-    wxChar **strings = new wxChar *[noTemplates];
-    wxChar **data = new wxChar *[noTemplates];
+    wxArrayString strings;
+    wxDocTemplate **data = new wxDocTemplate *[noTemplates];

     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {
         if (templates[i]->IsVisible())
         {
     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {
         if (templates[i]->IsVisible())
         {

-            strings[n] = (wxChar *)templates[i]->m_description.c_str();
-            data[n] = (wxChar *)templates[i];
+            strings.Add(templates[i]->m_description);
+            data[n] = templates[i];

             n ++;
         }
     }
             n ++;
         }
     }

-    if (n == 0)
-    {
-        delete[] strings;
-        delete[] data;
-        return (wxDocTemplate *) NULL;
-    }
-    else if (n == 1)
+
+    wxDocTemplate *theTemplate;
+
+    switch ( n )

     {
     {

-        wxDocTemplate *temp = (wxDocTemplate *)data[0];
-        delete[] strings;
-        delete[] data;
-        return temp;
-    }
+        case 0:
+            // no visible templates, hence nothing to choose from
+            theTemplate = NULL;
+            break;

 
 

-    wxWindow* parent = wxFindSuitableParent();
+        case 1:
+            // don't propose the user to choose if he heas no choice
+            theTemplate = data[0];
+            break;
+
+        default:
+            // propose the user to choose one of several
+            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+                          (
+                            _("Select a document template"),
+                            _("Templates"),
+                            strings,
+                            (void **)data,
+                            wxFindSuitableParent()
+                          );
+    }

 
 

-    wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,
-            strings, (void **)data, parent);
-    delete[] strings;

     delete[] data;
     delete[] data;

+

     return theTemplate;
 }
 
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
     return theTemplate;
 }
 
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,

-        int noTemplates)
+                                            int noTemplates)

 {
 {

-    wxChar **strings = new wxChar *[noTemplates];
-    wxChar **data = new wxChar *[noTemplates];
+    wxArrayString strings;
+    wxDocTemplate **data = new wxDocTemplate *[noTemplates];

     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {
     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {

-        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != wxT("")))
+        wxDocTemplate *templ = templates[i];
+        if ( templ->IsVisible() && !templ->GetViewName().empty() )

         {
         {

-            strings[n] = (wxChar *)templates[i]->m_viewTypeName.c_str();
-            data[n] = (wxChar *)templates[i];
+            strings.Add(templ->m_viewTypeName);
+            data[n] = templ;

             n ++;
         }
     }
             n ++;
         }
     }

-    wxWindow* parent = wxFindSuitableParent();

 
 

-    wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n,
-            strings, (void **)data, parent);
-    delete[] strings;
+    wxDocTemplate *theTemplate;
+
+    // the same logic as above
+    switch ( n )
+    {
+        case 0:
+            theTemplate = (wxDocTemplate *)NULL;
+            break;
+
+        case 1:
+            theTemplate = data[0];
+            break;
+
+        default:
+            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+                          (
+                            _("Select a document view"),
+                            _("Views"),
+                            strings,
+                            (void **)data,
+                            wxFindSuitableParent()
+                          );
+
+    }
+

     delete[] data;
     return theTemplate;
 }
     delete[] data;
     return theTemplate;
 }


@@ -1788,6 +1819,8 @@ wxCommandProcessor::wxCommandProcessor(int maxCommands)
     m_maxNoCommands = maxCommands;
     m_currentCommand = (wxNode *) NULL;
     m_commandEditMenu = (wxMenu *) NULL;
     m_maxNoCommands = maxCommands;
     m_currentCommand = (wxNode *) NULL;
     m_commandEditMenu = (wxMenu *) NULL;

+    m_undoAccelerator = wxT("\tCtrl+Z");
+    m_redoAccelerator = wxT("\tCtrl+Y");

 }
 
 wxCommandProcessor::~wxCommandProcessor()
 }
 
 wxCommandProcessor::~wxCommandProcessor()


@@ -1923,9 +1956,9 @@ void wxCommandProcessor::SetMenuStrings()
             if (commandName == wxT("")) commandName = _("Unnamed command");
             bool canUndo = command->CanUndo();
             if (canUndo)
             if (commandName == wxT("")) commandName = _("Unnamed command");
             bool canUndo = command->CanUndo();
             if (canUndo)

-                buf = wxString(_("&Undo ")) + commandName;
+                buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator;

             else
             else

-                buf = wxString(_("Can't &Undo ")) + commandName;
+                buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;

 
             m_commandEditMenu->SetLabel(wxID_UNDO, buf);
             m_commandEditMenu->Enable(wxID_UNDO, canUndo);
 
             m_commandEditMenu->SetLabel(wxID_UNDO, buf);
             m_commandEditMenu->Enable(wxID_UNDO, canUndo);


@@ -1936,24 +1969,24 @@ void wxCommandProcessor::SetMenuStrings()
                 wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
                 wxString redoCommandName(redoCommand->GetName());
                 if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
                 wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
                 wxString redoCommandName(redoCommand->GetName());
                 if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");

-                buf = wxString(_("&Redo ")) + redoCommandName;
+                buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;

                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
             }
             else
             {
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
             }
             else
             {

-                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo"));
+                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);

                 m_commandEditMenu->Enable(wxID_REDO, FALSE);
             }
         }
         else
         {
                 m_commandEditMenu->Enable(wxID_REDO, FALSE);
             }
         }
         else
         {

-            m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo"));
+            m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo") + m_undoAccelerator);

             m_commandEditMenu->Enable(wxID_UNDO, FALSE);
 
             if (m_commands.Number() == 0)
             {
             m_commandEditMenu->Enable(wxID_UNDO, FALSE);
 
             if (m_commands.Number() == 0)
             {

-                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo"));
+                m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);

                 m_commandEditMenu->Enable(wxID_REDO, FALSE);
             }
             else
                 m_commandEditMenu->Enable(wxID_REDO, FALSE);
             }
             else


@@ -1963,7 +1996,7 @@ void wxCommandProcessor::SetMenuStrings()
                 wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
                 wxString redoCommandName(redoCommand->GetName());
                 if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
                 wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
                 wxString redoCommandName(redoCommand->GetName());
                 if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");

-                buf = wxString(_("&Redo ")) + redoCommandName;
+                buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;

                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
             }
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
             }


@@ -2007,22 +2040,29 @@ wxFileHistory::~wxFileHistory()
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {
     int i;
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {
     int i;

+

     // Check we don't already have this file
     for (i = 0; i < m_fileHistoryN; i++)
     {
     // Check we don't already have this file
     for (i = 0; i < m_fileHistoryN; i++)
     {

-        if (m_fileHistory[i] && wxString(m_fileHistory[i]) == file)
+        if ( m_fileHistory[i] && (file == m_fileHistory[i]) )
+        {
+            // we do have it, move it to the top of the history
+            RemoveFileFromHistory (i);
+            AddFileToHistory (file);

             return;
             return;

+        }

     }
 
     }
 

-    // Add to the project file history:
-    // Move existing files (if any) down so we can insert file at beginning.
-
-    // First delete filename that has popped off the end of the array (if any)
-    if (m_fileHistoryN == m_fileMaxFiles)
+    // if we already have a full history, delete the one at the end
+    if ( m_fileMaxFiles == m_fileHistoryN )

     {
     {

-        delete[] m_fileHistory[m_fileMaxFiles-1];
-        m_fileHistory[m_fileMaxFiles-1] = (wxChar *) NULL;
+        RemoveFileFromHistory (m_fileHistoryN - 1);
+        AddFileToHistory (file);
+        return;

     }
     }

+
+    // Add to the project file history:
+    // Move existing files (if any) down so we can insert file at beginning.

     if (m_fileHistoryN < m_fileMaxFiles)
     {
         wxNode* node = m_fileMenus.First();
     if (m_fileHistoryN < m_fileMaxFiles)
     {
         wxNode* node = m_fileMenus.First();


@@ -2043,19 +2083,40 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     }
     m_fileHistory[0] = copystring(file);
 
     }
     m_fileHistory[0] = copystring(file);
 

+    // this is the directory of the last opened file
+    wxString pathCurrent;
+    wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL );

     for (i = 0; i < m_fileHistoryN; i++)
     for (i = 0; i < m_fileHistoryN; i++)

-        if (m_fileHistory[i])
+    {
+        if ( m_fileHistory[i] )

         {
         {

+            // if in same directory just show the filename; otherwise the full
+            // path
+            wxString pathInMenu, path, filename, ext;
+            wxSplitPath( m_fileHistory[i], &path, &filename, &ext );
+            if ( path == pathCurrent )
+            {
+                pathInMenu = filename;
+                if ( !ext.empty() )
+                    pathInMenu = pathInMenu + wxFILE_SEP_EXT + ext;
+            }
+            else
+            {
+                // absolute path; could also set relative path
+                pathInMenu = m_fileHistory[i];
+            }
+

             wxString buf;
             wxString buf;

-            buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
+            buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());

             wxNode* node = m_fileMenus.First();
             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->Data();
             wxNode* node = m_fileMenus.First();
             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->Data();

-                menu->SetLabel(wxID_FILE1+i, buf);
+                menu->SetLabel(wxID_FILE1 + i, buf);

                 node = node->Next();
             }
         }
                 node = node->Next();
             }
         }

+    }

 }
 
 void wxFileHistory::RemoveFileFromHistory(int i)
 }
 
 void wxFileHistory::RemoveFileFromHistory(int i)