File renaming, reordering and removing of icon files

dougransom · Sep 27, 2019 · 5dd0784 · 5dd0784
1 parent a0a879d
commit 5dd0784
Show file tree

Hide file tree

Showing 35 changed files with 49 additions and 475 deletions.
diff --git a/NatlinkSource/CMakeLists.txt b/NatlinkSource/CMakeLists.txt
@@ -14,33 +14,33 @@ project(${PROJECT_NAME})
 
 # Source Files
 set(SRC_FILES
-        ./appsupp.cpp
-        ./dictobj.cpp
+        COM/appsupp.cpp
+        DictationObject.cpp
         ./DragCode.cpp
-        ./excepts.cpp
-        ./GramObj.cpp
+        Exceptions.cpp
+        GrammarObject.cpp
         ./natlink.cpp
         ./pythwrap.cpp
-        ./ResObj.cpp
-        ./SecdThrd.cpp
+        ResultObject.cpp
+        MessageWindow.cpp
         StdAfx.cpp
         natlink.rc
         )
 source_group("Sources" FILES ${SRC_FILES})
 
 # Header Files
 set(HEADERS_FILES
-        appsupp.h
-        comsupp.h
-        dictobj.h
+        COM/appsupp.h
+        COM/comsupp.h
+        DictationObject.h
         DragCode.h
-        dspeech.h
-        excepts.h
-        GramObj.h
-        resobj.h
-        resource.h
-        SecdThrd.h
-        SPEECH.H
+        COM/dspeech.h
+        Exceptions.h
+        GrammarObject.h
+        ResultObject.h
+        Resource.h
+        MessageWindow.h
+        COM/SPEECH.H
         StdAfx.h
         )
 source_group("Headers" FILES ${HEADERS_FILES})

diff --git a/NatlinkSource/SPEECH.H → NatlinkSource/COM/SPEECH.H b/NatlinkSource/SPEECH.H → NatlinkSource/COM/SPEECH.H
diff --git a/NatlinkSource/appsupp.cpp → NatlinkSource/COM/appsupp.cpp b/NatlinkSource/appsupp.cpp → NatlinkSource/COM/appsupp.cpp
@@ -10,9 +10,9 @@
 	decision simplifies the design somewhat.
 */
 
-#include "stdafx.h"
-#include "resource.h"
-#include "DragCode.h"
+#include "../StdAfx.h"
+#include "../Resource.h"
+#include "../DragCode.h"
 #include "appsupp.h"
 
 // from PythWrap.cpp

diff --git a/NatlinkSource/appsupp.h → NatlinkSource/COM/appsupp.h b/NatlinkSource/appsupp.h → NatlinkSource/COM/appsupp.h
diff --git a/NatlinkSource/comsupp.h → NatlinkSource/COM/comsupp.h b/NatlinkSource/comsupp.h → NatlinkSource/COM/comsupp.h
diff --git a/NatlinkSource/dspeech.h → NatlinkSource/COM/dspeech.h b/NatlinkSource/dspeech.h → NatlinkSource/COM/dspeech.h
diff --git a/NatlinkSource/dictobj.cpp → NatlinkSource/DictationObject.cpp b/NatlinkSource/dictobj.cpp → NatlinkSource/DictationObject.cpp
@@ -10,9 +10,9 @@
 
 #include "stdafx.h"
 #include "DragCode.h"
-#include "DictObj.h"
-#include "ResObj.h"
-#include "Excepts.h"
+#include "DictationObject.h"
+#include "ResultObject.h"
+#include "Exceptions.h"
 
 // We use this macro to make sure the dictation object is usable
 #define MUSTBEUSABLE( func ) \

diff --git a/NatlinkSource/dictobj.h → NatlinkSource/DictationObject.h b/NatlinkSource/dictobj.h → NatlinkSource/DictationObject.h
diff --git a/NatlinkSource/DragCode.cpp b/NatlinkSource/DragCode.cpp
@@ -118,14 +118,14 @@
 
 
 #include "stdafx.h"
-#include "resource.h"
+#include "Resource.h"
 #include "DragCode.h"
-#include "GramObj.h"
-#include "ResObj.h"
-#include "dictobj.h"
-#include "appsupp.h"
-#include "SecdThrd.h"
-#include "Excepts.h"
+#include "GrammarObject.h"
+#include "ResultObject.h"
+#include "DictationObject.h"
+#include "COM/appsupp.h"
+#include "MessageWindow.h"
+#include "Exceptions.h"
 #include <cstring>
 
 // defined in PythWrap.cpp

diff --git a/NatlinkSource/excepts.cpp → NatlinkSource/Exceptions.cpp b/NatlinkSource/excepts.cpp → NatlinkSource/Exceptions.cpp
@@ -10,9 +10,9 @@
 #include "stdafx.h"
 #include <stdarg.h>
 #include "DragCode.h"
-#include "GramObj.h"
-#include "ResObj.h"
-#include "Excepts.h"
+#include "GrammarObject.h"
+#include "ResultObject.h"
+#include "Exceptions.h"
 
 // This is our set of error objects, one for each error listed in Excepts.h
 PyObject * ErrObjects[ ERROR_COUNT ];

diff --git a/NatlinkSource/excepts.h → NatlinkSource/Exceptions.h b/NatlinkSource/excepts.h → NatlinkSource/Exceptions.h
diff --git a/NatlinkSource/GramObj.cpp → NatlinkSource/GrammarObject.cpp b/NatlinkSource/GramObj.cpp → NatlinkSource/GrammarObject.cpp
@@ -10,9 +10,9 @@
 
 #include "stdafx.h"
 #include "DragCode.h"
-#include "GramObj.h"
-#include "ResObj.h"
-#include "Excepts.h"
+#include "GrammarObject.h"
+#include "ResultObject.h"
+#include "Exceptions.h"
 #include <fstream>
 #include <vector>
 

diff --git a/NatlinkSource/GramObj.h → NatlinkSource/GrammarObject.h b/NatlinkSource/GramObj.h → NatlinkSource/GrammarObject.h
diff --git a/NatlinkSource/SecdThrd.cpp → NatlinkSource/MessageWindow.cpp b/NatlinkSource/SecdThrd.cpp → NatlinkSource/MessageWindow.cpp
@@ -16,8 +16,8 @@
 */
 
 #include "stdafx.h"
-#include "resource.h"
-#include "SecdThrd.h"
+#include "Resource.h"
+#include "MessageWindow.h"
 #include <richedit.h>
 
 // This is the message we send to the other thread to add text to the output

diff --git a/NatlinkSource/SecdThrd.h → NatlinkSource/MessageWindow.h b/NatlinkSource/SecdThrd.h → NatlinkSource/MessageWindow.h
diff --git a/NatlinkSource/resource.h → NatlinkSource/Resource.h b/NatlinkSource/resource.h → NatlinkSource/Resource.h
diff --git a/NatlinkSource/ResObj.cpp → NatlinkSource/ResultObject.cpp b/NatlinkSource/ResObj.cpp → NatlinkSource/ResultObject.cpp
@@ -9,9 +9,9 @@
 
 #include "stdafx.h"
 #include "DragCode.h"
-#include "ResObj.h"
-#include "Excepts.h"
-#include "GramObj.h"
+#include "ResultObject.h"
+#include "Exceptions.h"
+#include "GrammarObject.h"
 
 // This macro is used at the top of functions which can not be called
 // when no grammar has been loaded

diff --git a/NatlinkSource/resobj.h → NatlinkSource/ResultObject.h b/NatlinkSource/resobj.h → NatlinkSource/ResultObject.h
diff --git a/NatlinkSource/StdAfx.h b/NatlinkSource/StdAfx.h
@@ -45,9 +45,9 @@ extern CComModule _Module;
 #include <stdio.h>
 #include <assert.h>
 
-#include "speech.h"
-#include "dspeech.h"
-#include "comsupp.h"
+#include "COM/SPEECH.H"
+#include "COM/dspeech.h"
+#include "COM/comsupp.h"
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.

diff --git a/NatlinkSource/idi_down.ico b/NatlinkSource/idi_down.ico
diff --git a/NatlinkSource/idi_down2.ico b/NatlinkSource/idi_down2.ico
diff --git a/NatlinkSource/idi_left.ico b/NatlinkSource/idi_left.ico
diff --git a/NatlinkSource/idi_left2.ico b/NatlinkSource/idi_left2.ico
diff --git a/NatlinkSource/idi_nodir.ico b/NatlinkSource/idi_nodir.ico
diff --git a/NatlinkSource/idi_right.ico b/NatlinkSource/idi_right.ico
diff --git a/NatlinkSource/idi_right2.ico b/NatlinkSource/idi_right2.ico
diff --git a/NatlinkSource/idi_up.ico b/NatlinkSource/idi_up.ico
diff --git a/NatlinkSource/idi_up2.ico b/NatlinkSource/idi_up2.ico
diff --git a/NatlinkSource/natlink.aps b/NatlinkSource/natlink.aps
diff --git a/NatlinkSource/natlink.cpp b/NatlinkSource/natlink.cpp
@@ -10,10 +10,10 @@
 */
 
 #include "stdafx.h"
-#include "resource.h"
+#include "Resource.h"
 #include "initguid.h"
 #include "DragCode.h"
-#include "appsupp.h"
+#include "COM/appsupp.h"
 
 CComModule _Module;
 

diff --git a/NatlinkSource/natlink.rc b/NatlinkSource/natlink.rc
@@ -140,46 +140,7 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_RIGHT               ICON                    "idi_right.ico"
-IDI_RIGHT2              ICON                    "idi_right2.ico"
-IDI_DOWN                ICON                    "idi_down.ico"
-IDI_DOWN2               ICON                    "idi_down2.ico"
-IDI_LEFT                ICON                    "idi_left.ico"
-IDI_LEFT2               ICON                    "idi_left2.ico"
-IDI_UP                  ICON                    "idi_up.ico"
-IDI_UP2                 ICON                    "idi_up2.ico"
-IDI_NODIR               ICON                    "idi_nodir.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MENU MENU
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&Reload Everything",          IDD_RELOAD
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
 
-STRINGTABLE
-BEGIN
-    IDS_PROJNAME            "natlink"
-END
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////