Patch #3045 2010-08-08 20:06

danselmi

Get rid of lexer_nassi.* files
Download
3045-Get_rid_of_lex.patch (4.8 KB)
Category
Plugin::Refinement
Status
Accepted
Close date
2010-08-11 14:19
Assigned to
mortenmacfly
Index: plugins/contrib/NassiShneiderman/NassiPlugin.cpp
===================================================================
--- plugins/contrib/NassiShneiderman/NassiPlugin.cpp    (revision 6463)
+++ plugins/contrib/NassiShneiderman/NassiPlugin.cpp    (working copy)
@@ -8,6 +8,7 @@
 #endif
 #include <configurationpanel.h>
 #include <cbstyledtextctrl.h>
+#include <filefilters.h>
 #include "NassiPlugin.h"
 
 #include "NassiEditorPanel.h"
@@ -149,6 +150,8 @@
     for ( int i = 0 ; i < MaxInsertMenuEntries ; i++ )
         Connect(insertCFromDiagram[i], wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(NassiPlugin::OnInsertCFromDiagram), 0, this);
     Connect(idParseC, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(NassiPlugin::ParseC), 0, this);
+
+    FileFilters::Add(_("Nassi Shneiderman diagram"), _T("*.nsd") );
 }
 
 void NassiPlugin::OnRelease(bool appShutDown)
Index: sdk/resources/lexers/lexer_nassi.xml
===================================================================
--- sdk/resources/lexers/lexer_nassi.xml    (revision 6463)
+++ sdk/resources/lexers/lexer_nassi.xml    (working copy)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE CodeBlocks_lexer_properties>
-<CodeBlocks_lexer_properties>
-  <Lexer name="Nassi Shneiderman diagram"
-         index="20"
-         filemasks="*.nsd,*.nsd">
-    <LanguageAttributes LineComment=""
-                        StreamCommentStart=""
-                        StreamCommentEnd=""
-                        BoxCommentStart=""
-                        BoxCommentMid=""
-                        BoxCommentEnd="" />
-  </Lexer>
-</CodeBlocks_lexer_properties>
Index: sdk/resources/lexers/lexer_nsis.sample
===================================================================
--- sdk/resources/lexers/lexer_nsis.sample    (revision 6463)
+++ sdk/resources/lexers/lexer_nsis.sample    (working copy)
@@ -1,101 +0,0 @@
-/*
- * This is a sample comment box
- */
-
-;-----------------------------------------
-;Sets Default Compression to lzma
-
-    SetCompressor lzma
-
-;-----------------------------------------
-;Use Modern UI
-
-    !include "MUI.nsh"
-
-;-----------------------------------------
-;General
-
-    XPStyle on
-    Name "Example"
-    OutFile "setup.exe"
-    InstallDir $PROGRAMFILES\Example
-    InstallDirRegKey HKLM "Software\Example" ""
-
-;----------------------------------------
-;Variables
-
-  Var STARTMENU_FOLDER
-
-;-----------------------------------------
-;Interface Settings
-
-    !define MUI_ABORTWARNING
-    !define MUI_UNABORTWARNING
-
-;-----------------------------------------
-;Pages
-
-    !insertmacro MUI_PAGE_WELCOME
-    !insertmacro MUI_PAGE_DIRECTORY
-    !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
-    !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Example"
-    !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Example"
-    !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-    !insertmacro MUI_PAGE_INSTFILES
-    !define MUI_FINISHPAGE_NOREBOOTSUPPORT
-    !insertmacro MUI_PAGE_FINISH
-
-    !insertmacro MUI_UNPAGE_WELCOME
-    !insertmacro MUI_UNPAGE_CONFIRM
-    !insertmacro MUI_UNPAGE_DIRECTORY
-    !insertmacro MUI_UNPAGE_INSTFILES
-    !insertmacro MUI_UNPAGE_FINISH
-
-;-----------------------------------------
-;Languages
-
-    !insertmacro MUI_LANGUAGE "English"
-
-;-----------------------------------------
-;Installer Section
-
-Section "Install"
-
-    WriteRegStr HKLM "Software\Example" "Install_Dir" $INSTDIR
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example" "DisplayIcon" $INSTDIR\uninstall.exe,0
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example" "DisplayName" "Example"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example" "InstallLocation" $INSTDIR
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example" "NoModify" 1
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example" "NoRepair" 1
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example" "UninstallString" $INSTDIR\uninstall.exe
-
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN "Application"
-
-    CreateDirectory $SMPROGRAMS\$STARTMENU_FOLDER
-    CreateShortCut $SMPROGRAMS\$STARTMENU_FOLDER\Uninstall Example.lnk $INSTDIR\uninstall.exe
-
-    !insertmacro MUI_STARTMENU_WRITE_END
-
-    SetOutPath $INSTDIR
-
-    WriteUninstaller "uninstall.exe"
-
-SectionEnd
-
-;-----------------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
-    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Example"
-    DeleteRegKey HKLM "Software\Example"
-
-    !insertmacro MUI_STARTMENU_GETFOLDER "Application" $STARTMENU_FOLDER
-
-    RMDir /r $SMPROGRAMS\$STARTMENU_FOLDER
-
-    Delete $INSTDIR\uninstall.exe
-
-    RMDir $INSTDIR
-
-SectionEnd