Permalink
Browse files

Merge branch 'master' of github.com:kipr/kiss

  • Loading branch information...
2 parents 0f02acd + 90de20f commit ea2b81b32a85562b0f87ee137a6958ac633a713a @bmcdorman bmcdorman committed Jan 16, 2013
View
@@ -82,7 +82,7 @@ ADD_DEFINITIONS(-DQT_SHAREDPOINTER_TRACK_POINTERS)
IF(APPLE)
SET(CMAKE_OSX_SYSROOT "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.6.sdk")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -g")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -arch i386 -g")
LINK_DIRECTORIES(/Library/Frameworks/)
ADD_EXECUTABLE(KISS MACOSX_BUNDLE ${KISS_SRCS_CXX})
ELSEIF(UNIX)
@@ -1,23 +0,0 @@
-#ifndef _EXTERNAL_TOOLS_HPP_
-#define _EXTERNAL_TOOLS_HPP_
-
-#include <QString>
-#include <QSettings>
-
-namespace Kiss
-{
- class ExternalTools
- {
- public:
- void setTool(const QString &name, const QString &path);
- QString tool(const QString &name);
- void removeTool(const QString &name);
-
- bool launch(const QString &name);
-
- private:
- QSettings m_settings;
- };
-}
-
-#endif
View
@@ -44,7 +44,7 @@
#define KISS_IDE_VERSION_MAJOR 4
#define KISS_IDE_VERSION_MINOR 0
-#define KISS_IDE_VERSION_BUILD 0
+#define KISS_IDE_VERSION_BUILD 1
#define KISS_IDE_VERSION_CODENAME "Oxygen"
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.6.0)
IF(APPLE)
SET(CMAKE_OSX_SYSROOT "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.6.sdk")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -g")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -arch i386 -g")
ENDIF(APPLE)
FIND_PACKAGE(Qt4 REQUIRED)
@@ -48,6 +48,7 @@ ADD_CUSTOM_TARGET(${PLUGIN_NAME}_osx_install_names ALL
QtDeclarative.framework/Versions/4/QtDeclarative
libkar.dylib
libpcompiler.dylib
+ libkovanserial.dylib
WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
DEPENDS ${PLUGIN_NAME})
INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${EXECUTABLE_OUTPUT_PATH}/KISS.app/Contents/interfaces)
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.6.0)
IF(APPLE)
SET(CMAKE_OSX_SYSROOT "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.6.sdk")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -g")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -arch i386 -g")
ENDIF(APPLE)
FIND_PACKAGE(Qt4 REQUIRED)
@@ -48,6 +48,7 @@ ADD_CUSTOM_TARGET(${PLUGIN_NAME}_osx_install_names ALL
QtDeclarative.framework/Versions/4/QtDeclarative
libkar.dylib
libpcompiler.dylib
+ libkovanserial.dylib
WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
DEPENDS ${PLUGIN_NAME})
INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${EXECUTABLE_OUTPUT_PATH}/KISS.app/Contents/interfaces)
@@ -46,7 +46,7 @@ void PortSampler::run()
}
TransportLayer transport(&usb);
KovanSerial proto(&transport);
- if(proto.knockKnock(350)) emit found(path);
+ if(proto.knockKnock(150)) emit found(path);
proto.hangup();
usb.endSession();
}
Binary file not shown.
Binary file not shown.
@@ -1,23 +0,0 @@
-#include "external_tools.hpp"
-
-using namespace Kiss;
-
-void ExternalTools::setTool(const QString &name, const QString &path)
-{
-
-}
-
-QString ExternalTools::tool(const QString &name)
-{
- return QString();
-}
-
-void ExternalTools::removeTool(const QString &name)
-{
-
-}
-
-bool ExternalTools::launch(const QString &name)
-{
- return false;
-}
@@ -7,16 +7,16 @@ FileOperationsMenu::FileOperationsMenu()
{
Node* newFile = node(activeAction(ResourceHelper::ref().icon("page_white.png"), "New File",
QKeySequence::New, this, "newFile"));
- Node* newProject = node(activeAction(ResourceHelper::ref().icon("brick.png"), "New Project",
- QKeySequence("Ctrl+Shift+N"), this, "newProject"));
+ /* Node* newProject = node(activeAction(ResourceHelper::ref().icon("brick.png"), "New Project",
+ QKeySequence("Ctrl+Shift+N"), this, "newProject")); */
Node* newTemplatePack = node(activeAction(ResourceHelper::ref().icon("package"), "New Template Pack",
QKeySequence::UnknownKey, this, "newTemplatePack"));
Node* openFile = node(activeAction(ResourceHelper::ref().icon("folder"), "Open...",
QKeySequence::Open, this, "open"));
Node* newSubmenu = node(action(ResourceHelper::ref().icon("page_white.png"), "New"));
newSubmenu->children.append(newFile);
- newSubmenu->children.append(newProject);
+ // newSubmenu->children.append(newProject);
newSubmenu->children.append(Node::separator());
newSubmenu->children.append(newTemplatePack);
@@ -31,7 +31,7 @@ FileOperationsMenu::FileOperationsMenu()
m_toolbar.append(newFile);
- m_toolbar.append(newProject);
+ // m_toolbar.append(newProject);
m_toolbar.append(openFile);
m_toolbar.append(Node::separator());
}
@@ -37,7 +37,8 @@ SourceFileMenu::SourceFileMenu(Widget::MainWindow *mainWindow)
m_file.append(node(activeAction(disk, "Save", QKeySequence::Save, this, "save")));
m_file.append(node(activeAction(disk, "Save As...", QKeySequence::SaveAs, this, "saveAs")));
- m_file.append(convertToProject = node(activeAction("cog_go", "Convert to Project", QKeySequence::UnknownKey, this, "convertToProject")));
+ // m_file.append(convertToProject = node(activeAction("cog_go", "Convert to Project",
+ // QKeySequence::UnknownKey, this, "convertToProject")));
m_file.append(node(activeAction("print", "Print", QKeySequence::Print, this, "print")));
m_file.append(Node::separator());
@@ -58,17 +59,9 @@ SourceFileMenu::SourceFileMenu(Widget::MainWindow *mainWindow)
m_edit.append(node(activeAction("magnifier.png", "Reset Zoom", QKeySequence("Ctrl+0"), this, "zoomReset")));
m_edit.append(Node::separator());
m_edit.append(node(activeAction("find", "Find", QKeySequence::Find, this, "find")));
-
- // undo->activeControl = redo->activeControl = true;
-
- Node* source = new Node("Source");
-
- source->children.append(node(activeAction("text_indent", "Indent All", QKeySequence("Ctrl+I"), this, "indentAll")));
- source->children.append(Node::separator());
- source->children.append(breakpoint = node(activeCheckedAction("bullet_blue", "Toggle Breakpoint", QKeySequence("Ctrl+Shift+B"), this, "toggleBreakpoint")));
- source->children.append(node(activeAction("bullet_delete", "Clear All Breakpoints", QKeySequence("Ctrl+Alt+Shift+B"), this, "clearBreakpoints")));
-
- m_actions.append(source);
+ m_edit.append(Node::separator());
+ m_edit.append(node(activeAction("text_indent", "Indent All",
+ QKeySequence("Ctrl+I"), this, "indentAll")));
m_toolbar.append(copy);
m_toolbar.append(cut);
@@ -90,9 +83,8 @@ void SourceFileMenu::update()
{
Widget::SourceFile* sourceFile = dynamic_cast<Widget::SourceFile*>(active());
if(!sourceFile) return;
- qWarning() << "Called";
- breakpoint->rawAction->setEnabled(sourceFile->breakpointOnLine(sourceFile->currentLine()));
- convertToProject->rawAction->setEnabled(!sourceFile->hasProject());
+ // breakpoint->rawAction->setEnabled(sourceFile->breakpointOnLine(sourceFile->currentLine()));
+ // convertToProject->rawAction->setEnabled(!sourceFile->hasProject());
}
QString SourceFileMenu::menuName()
View
@@ -128,7 +128,7 @@ bool SourceFile::beginSetup()
{
if(!hasFile()) {
if(!selectTemplate()) return false;
- } else setLexer(Lexer::Factory::ref().constructor(file().completeSuffix()));
+ } else updateLexer();
if(!target().data()) changeTarget();
return target().data();
}
@@ -788,7 +788,9 @@ void SourceFile::updateTitle()
void SourceFile::updateLexer()
{
// Update the lexer to the new spec for that extension
- Lexer::Constructor *constructor = Lexer::Factory::ref().constructor(file().completeSuffix());
+ Lexer::Constructor *constructor1 = Lexer::Factory::ref().constructor(file().completeSuffix());
+ Lexer::Constructor *constructor2 = Lexer::Factory::ref().constructor(file().suffix());
+ Lexer::Constructor *constructor = constructor1 ? constructor1 : constructor2;
if(!Lexer::Factory::isLexerFromConstructor(m_currentLexer, constructor)) setLexer(constructor);
}

0 comments on commit ea2b81b

Please sign in to comment.