Permalink
Browse files

Changing everything

  • Loading branch information...
1 parent 368fc68 commit 01069b25bb0b3de7793acb61de1cb5aec22903f2 @bmcdorman bmcdorman committed Sep 24, 2012
Showing with 4,312 additions and 5,582 deletions.
  1. +3 −5 CMakeLists.txt
  2. +0 −79 accessory/tinyarchive.cpp
  3. +0 −88 include/AudioTutorial.h
  4. +0 −36 include/Documentation.h
  5. +0 −40 include/DocumentationManager.h
  6. +0 −10 include/KissStandardEnvironment.h
  7. +0 −17 include/Listenable.h
  8. +0 −32 include/Log.h
  9. +0 −25 include/LogStreamBuf.h
  10. +0 −21 include/LogWindow.h
  11. +0 −231 include/MainWindow.h
  12. +0 −15 include/Named.h
  13. +0 −126 include/PluginManager.h
  14. +0 −211 include/SourceFile.h
  15. +0 −95 include/TabbedWidget.h
  16. +0 −71 include/VideoPlayerTab.h
  17. +0 −34 include/WorkingUnit.h
  18. 0 include/{Activatable.h → activatable.hpp}
  19. 0 include/{BuildOptions.h → build_options.hpp}
  20. +59 −51 include/{DeclarativeTab.h → declarative_tab.hpp}
  21. +0 −23 include/dialogs/PasswordDialog.h
  22. +0 −40 include/dialogs/ProjectSaveAs.h
  23. +0 −38 include/dialogs/RequestFileDialog.h
  24. +0 −38 include/dialogs/SourceDialog.h
  25. 0 include/dialogs/{EditorSettingsDialog.h → editor_settings_dialog.hpp}
  26. 0 include/dialogs/{MakeTemplateDialog.h → make_template_dialog.hpp}
  27. +23 −17 include/dialogs/{MessageDialog.h → message_dialog.hpp}
  28. +29 −0 include/dialogs/password_dialog.hpp
  29. +30 −23 include/dialogs/{TargetDialog.h → target_dialog.hpp}
  30. 0 include/dialogs/{TemplateDialog.h → template_dialog.hpp}
  31. +4 −3 include/dialogs/{ThemeSettingsDialog.h → theme_settings_dialog.hpp}
  32. +49 −0 include/documentation.hpp
  33. +43 −0 include/documentation_manager.hpp
  34. +0 −50 include/interface/CommunicationQueue.h
  35. +0 −21 include/interface/Interface.h
  36. +0 −32 include/interface/InterfaceManager.h
  37. +0 −30 include/interface/InterfaceModel.h
  38. +0 −14 include/interface/InterfacePluginManager.h
  39. +0 −15 include/interface/InterfaceResponder.h
  40. +0 −43 include/interface/QtTargetResponder.h
  41. +0 −84 include/interface/Target.h
  42. +0 −41 include/interface/TargetModel.h
  43. +0 −33 include/interface/TargetResponder.h
  44. +54 −0 include/interface/communication_queue.hpp
  45. +30 −0 include/interface/interface.hpp
  46. +39 −0 include/interface/interface_manager.hpp
  47. +36 −0 include/interface/interface_model.hpp
  48. +20 −0 include/interface/interface_plugin_manager.hpp
  49. +21 −0 include/interface/interface_responder.hpp
  50. +46 −0 include/interface/qt_target_responder.hpp
  51. +93 −0 include/interface/target.hpp
  52. +47 −0 include/interface/target_model.hpp
  53. +42 −0 include/interface/target_responder.hpp
  54. 0 include/{Kiss.h → kiss.hpp}
  55. +13 −0 include/kiss_standard_environment.hpp
  56. +0 −115 include/lexer/LexerFactory.h
  57. +0 −14 include/lexer/LexerPluginManager.h
  58. +0 −27 include/lexer/LexerScript.h
  59. +138 −0 include/lexer/lexer_factory.hpp
  60. +20 −0 include/lexer/lexer_plugin_manager.hpp
  61. 0 include/lexer/{SyntaxStandards.h → syntax_standards.hpp}
  62. +35 −0 include/log.hpp
  63. +31 −0 include/log_stream_buf.hpp
  64. +27 −0 include/log_window.hpp
  65. +16 −9 include/{MacroString.h → macro_string.hpp}
  66. +224 −0 include/main_window.hpp
  67. +0 −82 include/menus/ConcreteMenuable.h
  68. +0 −15 include/menus/FileOperationsMenu.h
  69. +0 −54 include/menus/MainWindowMenu.h
  70. +0 −147 include/menus/MenuManager.h
  71. +0 −57 include/menus/ProjectMenu.h
  72. +0 −54 include/menus/SourceFileMenu.h
  73. +91 −0 include/menus/concrete_menuable.hpp
  74. +36 −24 include/menus/{DeveloperMenu.h → developer_menu.hpp}
  75. +33 −18 include/menus/{DocumentationMenu.h → documentation_menu.hpp}
  76. +21 −0 include/menus/file_operations_menu.hpp
  77. +35 −43 include/menus/{WebTabMenu.h → main_window_menu.hpp}
  78. +169 −0 include/menus/menu_manager.hpp
  79. +10 −11 include/menus/{Menus.h → menus.hpp}
  80. +37 −19 include/{UiEventManager.h → menus/source_file_menu.hpp}
  81. +32 −26 include/menus/{TargetMenu.h → target_menu.hpp}
  82. +52 −30 include/{project/ProjectManager.h → menus/web_tab_menu.hpp}
  83. +137 −0 include/plugin_manager.hpp
  84. +0 −27 include/project/NewProjectWizard.h
  85. +0 −99 include/project/Project.h
  86. +0 −43 include/project/ProjectSettingsTab.h
  87. +0 −57 include/project/ProjectsModel.h
  88. +35 −0 include/project/new_project_wizard.hpp
  89. +54 −0 include/project/project.hpp
  90. +36 −0 include/project/project_manager.hpp
  91. +54 −0 include/project/project_settings.hpp
  92. +21 −18 include/{ResourceHelper.h → resource_helper.hpp}
  93. +22 −19 include/{Singleton.h → singleton.hpp}
  94. +202 −0 include/source_file.hpp
  95. +99 −0 include/tab.hpp
  96. +7 −7 include/{TemplateFormat.h → template_format.hpp}
  97. +5 −14 include/{TemplateManager.h → template_manager.hpp}
  98. +80 −68 include/{WebTab.h → web_tab.hpp}
  99. +26 −17 include/{WelcomeTab.h → welcome_tab.hpp}
  100. +0 −30 include/widgets/ErrorWidget.h
  101. +0 −60 include/widgets/SourceLocalFailed.h
  102. +0 −16 include/widgets/TitleDescriptionWidget.h
  103. 0 include/widgets/{ColorBox.h → color_box.hpp}
  104. +20 −0 include/widgets/output_widget.hpp
  105. +33 −27 include/widgets/{SourceFindWidget.h → source_find_widget.hpp}
  106. +22 −0 include/widgets/title_description_widget.hpp
  107. +37 −0 include/working_unit.hpp
  108. +11 −11 plugins/interfaces/shared/SerialDevice.cpp
  109. +14 −13 plugins/interfaces/shared/TcpSocketDevice.cpp
  110. +239 −0 scripts/KISS Platform.pmdoc/index.xml
  111. +0 −178 src/AudioTutorial.cpp
  112. +0 −11 src/Named.cpp
  113. +0 −39 src/UiEventManager.cpp
  114. +0 −85 src/VideoPlayerTab.cpp
  115. +7 −7 src/{Activatable.cpp → activatable.cpp}
  116. +13 −8 src/{DeclarativeTab.cpp → declarative_tab.cpp}
  117. +0 −93 src/dialogs/ProjectSaveAs.cpp
  118. +0 −32 src/dialogs/RequestFileDialog.cpp
  119. +0 −25 src/dialogs/SourceDialog.cpp
  120. +2 −2 src/dialogs/{EditorSettingsDialog.cpp → editor_settings_dialog.cpp}
  121. +1 −1 src/dialogs/{MakeTemplateDialog.cpp → make_template_dialog.cpp}
  122. +18 −11 src/dialogs/{MessageDialog.cpp → message_dialog.cpp}
  123. +6 −4 src/dialogs/{PasswordDialog.cpp → password_dialog.cpp}
  124. +19 −15 src/dialogs/{TargetDialog.cpp → target_dialog.cpp}
  125. +17 −48 src/dialogs/{TemplateDialog.cpp → template_dialog.cpp}
  126. +6 −4 src/dialogs/{ThemeSettingsDialog.cpp → theme_settings_dialog.cpp}
  127. +18 −16 src/{Documentation.cpp → documentation.cpp}
  128. +3 −1 src/{DocumentationManager.cpp → documentation_manager.cpp}
  129. +0 −4 src/interface/Interface.cpp
  130. +0 −17 src/interface/InterfacePluginManager.cpp
  131. +0 −66 src/interface/QtTargetResponder.cpp
  132. +6 −10 src/interface/{CommunicationQueue.cpp → communication_queue.cpp}
  133. +14 −0 src/interface/interface.cpp
  134. +4 −2 src/interface/{InterfaceManager.cpp → interface_manager.cpp}
  135. +20 −15 src/interface/{InterfaceModel.cpp → interface_model.cpp}
  136. +19 −0 src/interface/interface_plugin_manager.cpp
  137. +68 −0 src/interface/qt_target_responder.cpp
  138. +27 −9 src/interface/{Target.cpp → target.cpp}
  139. +14 −10 src/interface/{TargetModel.cpp → target_model.cpp}
  140. +12 −14 src/{KissStandardEnvironment.cpp → kiss_standard_environment.cpp}
  141. +0 −16 src/lexer/LexerPluginManager.cpp
  142. +24 −16 src/lexer/{LexerFactory.cpp → lexer_factory.cpp}
  143. +18 −0 src/lexer/lexer_plugin_manager.cpp
  144. +1 −1 src/lexer/{SyntaxStandards.cpp → syntax_standards.cpp}
  145. +3 −1 src/{Log.cpp → log.cpp}
  146. +6 −5 src/{LogStreamBuf.cpp → log_stream_buf.cpp}
  147. +5 −2 src/{LogWindow.cpp → log_window.cpp}
  148. +24 −25 src/main.cpp
  149. +118 −168 src/{MainWindow.cpp → main_window.cpp}
  150. +0 −25 src/menus/FileOperationsMenu.cpp
  151. +0 −43 src/menus/ProjectMenu.cpp
  152. +63 −25 src/menus/{ConcreteMenuable.cpp → concrete_menuable.cpp}
  153. +14 −23 src/menus/{DeveloperMenu.cpp → developer_menu.cpp}
  154. +15 −10 src/menus/{DocumentationMenu.cpp → documentation_menu.cpp}
  155. +28 −0 src/menus/file_operations_menu.cpp
  156. +18 −14 src/menus/{MainWindowMenu.cpp → main_window_menu.cpp}
  157. +65 −63 src/menus/{MenuManager.cpp → menu_manager.cpp}
  158. +21 −17 src/menus/{SourceFileMenu.cpp → source_file_menu.cpp}
  159. +13 −10 src/menus/{TargetMenu.cpp → target_menu.cpp}
  160. +17 −10 src/menus/{WebTabMenu.cpp → web_tab_menu.cpp}
  161. +0 −194 src/project/Project.cpp
  162. +0 −64 src/project/ProjectManager.cpp
  163. +0 −158 src/project/ProjectSettingsTab.cpp
  164. +0 −291 src/project/ProjectsModel.cpp
  165. +9 −7 src/project/{NewProjectWizard.cpp → new_project_wizard.cpp}
  166. +109 −0 src/project/project.cpp
  167. +38 −0 src/project/project_manager.cpp
  168. +155 −0 src/project/project_settings.cpp
  169. +4 −2 src/{ResourceHelper.cpp → resource_helper.cpp}
  170. +195 −319 src/{SourceFile.cpp → source_file.cpp}
  171. +72 −0 src/tab.cpp
  172. +2 −2 src/{TemplateFormat.cpp → template_format.cpp}
  173. +1 −85 src/{TemplateManager.cpp → template_manager.cpp}
  174. +14 −37 src/{WebTab.cpp → web_tab.cpp}
  175. +13 −8 src/{WelcomeTab.cpp → welcome_tab.cpp}
  176. +0 −74 src/widgets/ErrorWidget.cpp
  177. +0 −74 src/widgets/SourceLocalFailed.cpp
  178. +0 −24 src/widgets/TitleDescriptionWidget.cpp
  179. +2 −1 src/widgets/{ColorBox.cpp → color_box.cpp}
  180. +17 −0 src/widgets/output_widget.cpp
  181. +17 −12 src/widgets/{SourceFindWidget.cpp → source_find_widget.cpp}
  182. +27 −0 src/widgets/title_description_widget.cpp
  183. +12 −8 src/{WorkingUnit.cpp → working_unit.cpp}
  184. +2 −0 tests/CMakeLists.txt
  185. +25 −0 tests/OutputWidgetTest.cpp
  186. +4 −4 ui/MainWindow.ui
  187. +4 −13 ui/SourceFile.ui
  188. +1 −1 ui/ThemeSettingsDialog.ui
View
@@ -80,7 +80,7 @@ ADD_LIBRARY(kisside STATIC ${KISS_SRCS_CXX})
SET(EXECUTABLE_OUTPUT_PATH ${KISS_SOURCE_DIR}/deploy)
SET(LIBRARY_OUTPUT_PATH ${KISS_SOURCE_DIR}/lib)
-TARGET_LINK_LIBRARIES(KISS ${QT_LIBRARIES} qscintilla2 kiss-compiler tinyarchive z)
+TARGET_LINK_LIBRARIES(KISS ${QT_LIBRARIES} qscintilla2 pcompiler tinyarchive z)
IF(APPLE)
ADD_CUSTOM_TARGET(MacDeployQt ALL
@@ -110,9 +110,7 @@ ENDIF(APPLE)
LINK_DIRECTORIES(${KISS_SOURCE_DIR}/lib)
-# ADD_EXECUTABLE(command_chain_test tests/CommandChainTest.cpp)
-# TARGET_LINK_LIBRARIES(command_chain_test ${QT_LIBRARIES} kisside)
-
install(FILES ${INCLUDES} DESTINATION /usr/local/include/kiss/)
-add_subdirectory(plugins)
+add_subdirectory(plugins)
+add_subdirectory(tests)
View
@@ -1,79 +0,0 @@
-#include <TinyArchive.h>
-#include <iostream>
-#include <fstream>
-#include <cstring>
-
-using namespace std;
-
-#define LIST_COMMAND "list"
-#define CREATE_COMMAND "create"
-#define EXTRACT_COMMAND "extract"
-
-void usage(const char* location)
-{
- cout << location << " "
- << LIST_COMMAND << "|"
- << CREATE_COMMAND << "|"
- << EXTRACT_COMMAND << " tiny.archive [parameters]" << endl;
-}
-
-int main(int argc, char* argv[])
-{
- if(argc == 1 || argc == 2) {
- cout << "Error: Too few arguments" << endl;
- usage(argv[0]);
- return 1;
- }
-
- char* command = argv[1];
- char* archive = argv[2];
-
- TinyArchive* tinyArchive = 0;
-
- if(!strcmp(command, LIST_COMMAND)) {
- ifstream ifs;
- ifs.open(archive, ifstream::in);
- if(!ifs.is_open()) {
- cout << "Error: Unable to open " << archive << " for reading";
- return 1;
- }
- tinyArchive = TinyArchive::read(ifs);
- if(!tinyArchive) {
- cout << "Tiny Archive encountered an error while reading " << archive;
- return 1;
- }
- ifs.close();
- TinyArchive::iterator it = tinyArchive->begin();
- for(; it != tinyArchive->end(); ++it) {
- cout << (*it).path << endl;
- }
- delete tinyArchive;
- } else if(!strcmp(command, CREATE_COMMAND)) {
- tinyArchive = new TinyArchive();
- for(int i = 3; i < argc; ++i) {
- ifstream ifs;
- ifs.open(argv[i], ifstream::in);
- if(!ifs.is_open()) {
- cout << "Error: Unable to open " << argv[i] << " for reading";
- return 1;
- }
- char* test = "test";
- tinyArchive->push_back(ArchiveEntry(argv[i], test, 4));
- ifs.close();
- }
-
- ofstream ofs;
- ofs.open(archive, ifstream::out);
- tinyArchive->write(ofs);
- ofs.close();
-
- delete tinyArchive;
- } else if(!strcmp(command, EXTRACT_COMMAND)) {
- } else {
- cout << "Error: Unrecognized command \"" << command << "\"" << endl;
- usage(argv[0]);
- return 1;
- }
-
- return 0;
-}
View
@@ -1,88 +0,0 @@
-/**************************************************************************
- * Copyright 2007-2012 KISS Institute for Practical Robotics *
- * *
- * This file is part of KISS (Kipr's Instructional Software System). *
- * *
- * KISS is free software: you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation, either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * KISS is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with KISS. Check the LICENSE file in the project root. *
- * If not, see <http://www.gnu.org/licenses/>. *
- **************************************************************************/
-
-#ifndef _AUDIOTUTORIAL_H_
-#define _AUDIOTUTORIAL_H_
-
-#include "BuildOptions.h"
-
-#include <QObject>
-
-class AudioTutorial;
-
-#ifdef BUILD_AUDIO_TUTORIAL
-
-#include "UiEventManager.h"
-
-#include <QList>
-#include <QWidget>
-#ifdef Q_OS_MAC
-#include <Phonon>
-#else
-#include <phonon>
-#endif
-
-struct TutorialState;
-
-class AudioTutorial : public QObject, public UiEventListener
-{
-Q_OBJECT
-public:
- AudioTutorial(const QString& path);
- ~AudioTutorial();
-
- const bool start();
- void resume();
- void stop();
-
- const int state() const;
- const bool loaded() const;
-
- void uiEvent(const QString& name, const QStringList& args);
-
- enum {
- Playing,
- Waiting,
- Off
- };
-
-private slots:
- void finished();
-
-private:
- void load();
- bool m_loaded;
-
- bool fastForward(const QString& name);
-
- int m_state;
- int m_currentIndex;
-
- Phonon::MediaObject* m_current;
- QString m_path;
-
- TutorialState* m_exit;
-
- QList<TutorialState*> m_states;
-};
-
-#endif
-
-#endif
View
@@ -1,36 +0,0 @@
-#ifndef _DOCUMENTATION_H_
-#define _DOCUMENTATION_H_
-
-#include "BuildOptions.h"
-
-#include <QObject>
-
-class Documentation;
-
-#ifdef BUILD_DOCUMENTATION_TAB
-
-#include "TabbedWidget.h"
-#include <QListWidgetItem>
-
-#define UI_EVENT_OPEN_MANUAL "openManual"
-
-class MainWindow;
-
-class Documentation : public QObject, public TabbedWidget
-{
-Q_OBJECT
-public:
- Documentation(MainWindow* parent);
-
- void activate();
- bool beginSetup();
- void completeSetup();
- bool close();
- void refreshSettings();
-private slots:
- void itemDoubleClicked(QListWidgetItem* item);
-};
-
-#endif
-
-#endif
@@ -1,40 +0,0 @@
-#ifndef _DOCUMENTATIONMANAGER_H_
-#define _DOCUMENTATIONMANAGER_H_
-
-#include "Singleton.h"
-
-#include <QString>
-#include <QList>
-
-class DocumentationLocation
-{
-public:
- DocumentationLocation(const QString& name, const QString& location,
- const QString& description, const QString& decoration);
-
- const QString& name() const;
- const QString& location() const;
- const QString& description() const;
- const QString& decoration() const;
-
-private:
- QString m_name;
- QString m_location;
- QString m_description;
- QString m_decoration;
-};
-
-class DocumentationManager : public Singleton<DocumentationManager>
-{
-public:
- DocumentationManager();
- void addLocation(const QString& name, const QString& location);
- const QList<DocumentationLocation>& locations() const;
-
-private:
- static const QString description(const QString& location);
- static const QString decoration(const QString& location);
- QList<DocumentationLocation> m_locations;
-};
-
-#endif
@@ -1,10 +0,0 @@
-#ifndef _STANDARDKISSENVIRONMENT_H_
-#define _STANDARDKISSENVIRONMENT_H_
-
-class KissStandardEnvironment
-{
-public:
- static void createStandardEnvironment();
-};
-
-#endif
View
@@ -1,17 +0,0 @@
-#ifndef _LISTENABLE_H_
-#define _LISTENABLE_H_
-
-#include <QList>
-
-template<typename T>
-struct Listenable
-{
- void addListener(T* t) { m_listeners.append(t); }
- void removeListener(T* t) { m_listeners.removeAll(t); }
- void removeAllListeners() { m_listeners.clear(); }
- const QList<T*>& listeners() { return m_listeners; }
-private:
- QList<T*> m_listeners;
-};
-
-#endif
View
@@ -1,32 +0,0 @@
-#ifndef _LOG_H_
-#define _LOG_H_
-
-#include "Singleton.h"
-
-#include <QString>
-
-class Log : public Singleton<Log>
-{
-public:
- void setLoggingLevel(const int& level);
- const int loggingLevel() const;
-
- enum Level {
- Errors,
- Warnings,
- Info,
- Debug
- };
-
- void error(const QString& message) const;
- void warning(const QString& message) const;
- void info(const QString& message) const;
- void debug(const QString& message) const;
-
- void message(const QString& message) const;
-private:
-
- int m_level;
-};
-
-#endif
View
@@ -1,25 +0,0 @@
-#ifndef _LOGSTREAMBUF_H_
-#define _LOGSTREAMBUF_H_
-
-#include <streambuf>
-#include <vector>
-
-class LogWindow;
-
-class LogStreamBuf : public std::streambuf
-{
-public:
- explicit LogStreamBuf(std::size_t bufferSize = 256);
-protected:
- bool flush();
-private:
- int_type overflow(int_type ch);
- int sync();
-
- LogStreamBuf(const LogStreamBuf&);
- LogStreamBuf& operator= (const LogStreamBuf&);
-private:
- std::vector<char> m_buffer;
-};
-
-#endif
View
@@ -1,21 +0,0 @@
-#ifndef _LOGWINDOW_H_
-#define _LOGWINDOW_H_
-
-#include <QWidget>
-
-#include "ui_LogWindow.h"
-#include "Singleton.h"
-
-#include "LogStreamBuf.h"
-
-class LogWindow : public QWidget, private Ui::LogWindow, public Singleton<LogWindow>
-{
-public:
- LogWindow();
-
- friend class LogStreamBuf;
-private:
- void append(const QString& str);
-};
-
-#endif
Oops, something went wrong.

0 comments on commit 01069b2

Please sign in to comment.