gmane.comp.audio.supercollider.devel
http://blog.gmane.org/gmane.comp.audio.supercollider.devel
hourly
1
1901-01-01T00:00+00:00
Gmane
http://gmane.org/img/gmane-25t.png
http://gmane.org
-
SF.net Git: supercollider branch, master, updated. 8bfc3f49053a8081e7d986743711fd7706cb047b
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50943
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via 8bfc3f49053a8081e7d986743711fd7706cb047b (commit)
from 085bc7867166b19b1b1c471aa231dac07f332f64 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8bfc3f49053a8081e7d986743711fd7706cb047b
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Sat May 26 15:18:38 2012 +0200
sc ide: fix recent documents menu
Do not reload the list of recent documents from configuration file on
every request from settings manager to apply settings, as that would
discard changes occurred at runtime.
Instead, only load the list once at start up.
diff --git a/editors/sc-ide/core/doc_manager.cpp b/editors/sc-ide/core/doc_manager.cpp
index e3e1abf..a30a104 100644
--- a/editors/sc-ide/core/doc_manager.cpp
+++ b/editors/sc-ide/core/doc_manager.cpp
< at >< at > -35,8 +35,6 < at >< at > DocumentManager::DocumentManager( Main *main ):
{
connect(&mFsWatcher, SIGNAL(fileChanged(QString)), this, SLOT(onFileChanged(QString)));
- connect(main, SIGNAL(applySettingsRequest(Settings::Manager*)),
- this, SLOT(applySettings(Settings::Manager*)));
connect(main, SIGNAL(storeSettingsRequest(Settings::Manager*)),
this, SLOT(storeSettings(Settings::Manager*)));
-----------------------------------------------------------------------
Summary of changes:
editors/sc-ide/core/doc_manager.cpp | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
hooks/post-receive
</pre>
Jakob Leben
2012-05-26T13:21:17
-
[PATCH] sc ide: DocumentManager: always resolve paths to canonical form
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50942
<pre>---
editors/sc-ide/core/doc_manager.cpp | 72 ++++++++++++++++-----------
editors/sc-ide/core/doc_manager.hpp | 10 ++--
editors/sc-ide/widgets/documents_dialog.cpp | 4 +-
editors/sc-ide/widgets/main_window.cpp | 5 +-
4 files changed, 51 insertions(+), 40 deletions(-)
diff --git a/editors/sc-ide/core/doc_manager.cpp b/editors/sc-ide/core/doc_manager.cpp
index e3e1abf..2e27402 100644
--- a/editors/sc-ide/core/doc_manager.cpp
+++ b/editors/sc-ide/core/doc_manager.cpp
< at >< at > -50,15 +50,24 < at >< at > void DocumentManager::create()
Q_EMIT( opened(doc, 0) );
}
-void DocumentManager::open( const QString & filename, int initialCursorPosition )
+void DocumentManager::open( const QString & path, int initialCursorPosition )
{
+ QFileInfo info(path);
+ QString cpath = info.canonicalFilePath();
+ info.setFile(cpath);
+
+ if (cpath.isEmpty()) {
+ qWarning() << "DocumentManager: Can not open file: canonical path is empty.";
+ return;
+ }
+
// Check if file already opened
DocIterator it;
for( it = mDocHash.begin(); it != mDocHash.end(); ++it )
{
Document *doc = it.value();
- if(doc->fileName() == filename) {
+ if(doc->mFilePath == cpath) {
Q_EMIT( showRequest(doc, initialCursorPosition) );
addToRecent(doc);
return;
< at >< at > -67,9 +76,9 < at >< at > void DocumentManager::open( const QString & filename, int initialCursorPosition
// Open the file
- QFile file(filename);
+ QFile file(cpath);
if(!file.open(QIODevice::ReadOnly)) {
- qWarning() << "DocumentManager: the file" << filename << "could not be opened for reading.";
+ qWarning() << "DocumentManager: the file" << cpath << "could not be opened for reading.";
return;
}
QByteArray bytes( file.readAll() );
< at >< at > -78,12 +87,12 < at >< at > void DocumentManager::open( const QString & filename, int initialCursorPosition
Document *doc = new Document();
doc->mDoc->setPlainText( QString::fromUtf8( bytes.data(), bytes.size() ) );
doc->mDoc->setModified(false);
- doc->mFileName = filename;
- doc->mTitle = QDir(filename).dirName();
+ doc->mFilePath = cpath;
+ doc->mTitle = info.fileName();
mDocHash.insert( doc->id(), doc );
- mFsWatcher.addPath(filename);
+ mFsWatcher.addPath(cpath);
Q_EMIT( opened(doc, initialCursorPosition) );
addToRecent(doc);
< at >< at > -93,12 +102,12 < at >< at > bool DocumentManager::reload( Document *doc )
{
Q_ASSERT(doc);
- if (doc->mFileName.isEmpty())
+ if (doc->mFilePath.isEmpty())
return false;
- QFile file(doc->mFileName);
+ QFile file(doc->mFilePath);
if(!file.open(QIODevice::ReadOnly)) {
- qWarning() << "DocumentManager: the file" << doc->mFileName << "could not be opened for reading.";
+ qWarning() << "DocumentManager: the file" << doc->mFilePath << "could not be opened for reading.";
return false;
}
QByteArray bytes( file.readAll() );
< at >< at > -107,8 +116,8 < at >< at > bool DocumentManager::reload( Document *doc )
doc->mDoc->setPlainText( QString::fromUtf8( bytes.data(), bytes.size() ) );
doc->mDoc->setModified(false);
- if (!mFsWatcher.files().contains(doc->mFileName))
- mFsWatcher.addPath(doc->mFileName);
+ if (!mFsWatcher.files().contains(doc->mFilePath))
+ mFsWatcher.addPath(doc->mFilePath);
return true;
}
< at >< at > -122,8 +131,8 < at >< at > void DocumentManager::close( Document *doc )
return;
}
- if (!doc->mFileName.isEmpty())
- mFsWatcher.removePath(doc->mFileName);
+ if (!doc->mFilePath.isEmpty())
+ mFsWatcher.removePath(doc->mFilePath);
Q_EMIT( closed(doc) );
delete doc;
< at >< at > -133,28 +142,31 < at >< at > bool DocumentManager::save( Document *doc )
{
Q_ASSERT(doc);
- if (doc->mFileName.isEmpty())
+ if (doc->mFilePath.isEmpty())
return false;
- return doSaveAs( doc, doc->mFileName );
+ return doSaveAs( doc, doc->mFilePath );
}
-bool DocumentManager::saveAs( Document *doc, const QString & filename )
+bool DocumentManager::saveAs( Document *doc, const QString & path )
{
Q_ASSERT(doc);
- bool ok = doSaveAs( doc, filename );
+
+ bool ok = doSaveAs( doc, QFileInfo(path).canonicalFilePath() );
if (ok)
addToRecent(doc);
return ok;
}
-bool DocumentManager::doSaveAs( Document *doc, const QString & fileName )
+bool DocumentManager::doSaveAs( Document *doc, const QString & cpath )
{
+ // WARNING: cpath must be in canonical form!
+
Q_ASSERT(doc);
- QFile file(fileName);
+ QFile file(cpath);
if(!file.open(QIODevice::WriteOnly)) {
- qWarning() << "DocumentManager: the file" << fileName << "could not be opened for writing.";
+ qWarning() << "DocumentManager: the file" << cpath << "could not be opened for writing.";
return false;
}
< at >< at > -162,15 +174,15 < at >< at > bool DocumentManager::doSaveAs( Document *doc, const QString & fileName )
file.write(str.toUtf8());
file.close();
- doc->mFileName = fileName;
- doc->mTitle = QDir(fileName).dirName();
+ QFileInfo info(cpath);
+ doc->mFilePath = cpath;
+ doc->mTitle = info.fileName();
doc->mDoc->setModified(false);
- QFileInfo finfo(file);
- doc->mSaveTime = finfo.lastModified();
+ doc->mSaveTime = info.lastModified();
// Always try to start watching, because the file could have been removed:
- if (!mFsWatcher.files().contains(fileName))
- mFsWatcher.addPath(fileName);
+ if (!mFsWatcher.files().contains(cpath))
+ mFsWatcher.addPath(cpath);
Q_EMIT(saved(doc));
< at >< at > -183,8 +195,8 < at >< at > void DocumentManager::onFileChanged( const QString & path )
for( it = mDocHash.begin(); it != mDocHash.end(); ++it )
{
Document *doc = it.value();
- if (doc->mFileName == path) {
- QFileInfo info(doc->mFileName);
+ if (doc->mFilePath == path) {
+ QFileInfo info(doc->mFilePath);
if (doc->mSaveTime < info.lastModified()) {
doc->mDoc->setModified(true);
emit changedExternally(doc);
< at >< at > -195,7 +207,7 < at >< at > void DocumentManager::onFileChanged( const QString & path )
void DocumentManager::addToRecent( Document *doc )
{
- const QString &path = doc->fileName();
+ const QString &path = doc->mFilePath;
int i = mRecent.indexOf(path);
if (i != -1)
mRecent.move( i, 0 );
diff --git a/editors/sc-ide/core/doc_manager.hpp b/editors/sc-ide/core/doc_manager.hpp
index 5f6e80c..3497b96 100644
--- a/editors/sc-ide/core/doc_manager.hpp
+++ b/editors/sc-ide/core/doc_manager.hpp
< at >< at > -52,13 +52,13 < at >< at > public:
QTextDocument *textDocument() { return mDoc; }
const QByteArray & id() { return mId; }
- const QString & fileName() { return mFileName; }
+ const QString & filePath() { return mFilePath; }
const QString & title() { return mTitle; }
private:
QByteArray mId;
QTextDocument *mDoc;
- QString mFileName;
+ QString mFilePath;
QString mTitle;
QDateTime mSaveTime;
};
< at >< at > -77,13 +77,13 < at >< at > public:
void create();
void close( Document * );
bool save( Document * );
- bool saveAs( Document *, const QString & filename );
+ bool saveAs( Document *, const QString & path );
bool reload( Document * );
const QStringList & recents() const { return mRecent; }
public slots:
// initialCursorPosition -1 means "don't change position if already open"
- void open( const QString & filename, int initialCursorPosition = -1 );
+ void open( const QString & path, int initialCursorPosition = -1 );
void clearRecents();
void applySettings( Settings::Manager * );
void storeSettings( Settings::Manager * );
< at >< at > -101,7 +101,7 < at >< at > private slots:
void onFileChanged( const QString & path );
private:
- bool doSaveAs( Document *, const QString & filename );
+ bool doSaveAs( Document *, const QString & path );
void addToRecent( Document * );
typedef QHash<QByteArray, Document*>::iterator DocIterator;
diff --git a/editors/sc-ide/widgets/documents_dialog.cpp b/editors/sc-ide/widgets/documents_dialog.cpp
index 12c3f14..19d1df4 100644
--- a/editors/sc-ide/widgets/documents_dialog.cpp
+++ b/editors/sc-ide/widgets/documents_dialog.cpp
< at >< at > -270,8 +270,8 < at >< at > DocumentsDialog::Item::Item(Document *doc):
void DocumentsDialog::Item::update()
{
setTitle(mDoc->title());
- setPath(mDoc->fileName());
- if (!mDoc->fileName().isEmpty() && !QFile::exists(mDoc->fileName())) {
+ setPath(mDoc->filePath());
+ if (!mDoc->filePath().isEmpty() && !QFile::exists(mDoc->filePath())) {
setStatus("Removed");
setChecked(false);
}
diff --git a/editors/sc-ide/widgets/main_window.cpp b/editors/sc-ide/widgets/main_window.cpp
index f2820df..2950941 100644
--- a/editors/sc-ide/widgets/main_window.cpp
+++ b/editors/sc-ide/widgets/main_window.cpp
< at >< at > -510,7 +510,7 < at >< at > bool MainWindow::close( Document *doc )
bool MainWindow::reload( Document *doc )
{
- if (doc->fileName().isEmpty())
+ if (doc->filePath().isEmpty())
return false;
if (doc->textDocument()->isModified())
< at >< at > -534,8 +534,7 < at >< at > bool MainWindow::reload( Document *doc )
bool MainWindow::save( Document *doc, bool forceChoose )
{
DocumentManager *mng = Main::instance()->documentManager();
- QString fileName = doc->fileName();
- if (forceChoose || fileName.isEmpty())
+ if (forceChoose || doc->filePath().isEmpty())
{
QFileDialog dialog(mInstance);
</pre>
Jakob Leben
2012-05-26T13:06:34
-
Scale.directory crossplatform-ness
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50941
<pre>I assume this is uncontroversial. Should go into master and 3.5.
I tested by running "Scale.directory" in commandline sclang, and the directory string was dumped to standard output, as expected.
OK?
hjh
--
James Harkins /// dewdrop world
jamshark70-n2XjBy9Frl0FLkkUnhLBSV6hYfS7NtTn< at >public.gmane.org
http://www.dewdrop-world.net
"Come said the Muse,
Sing me a song no poet has yet chanted,
Sing me the universal." -- Whitman
blog: http://www.dewdrop-world.net/words
audio clips: http://www.dewdrop-world.net/audio
more audio: http://soundcloud.com/dewdrop_world/tracks
</pre>
James Harkins
2012-05-26T01:35:20
-
SF.net Git: supercollider branch, master, updated. 085bc7867166b19b1b1c471aa231dac07f332f64
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50940
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via 085bc7867166b19b1b1c471aa231dac07f332f64 (commit)
via f21a4ed0a26f3979c353232716dd255d5d32d7c7 (commit)
via 391cc4b1c2af98adae424da7cafcbab63f6919d8 (commit)
from 8f471ec1f61187ef8969eb2860cee288cd27c989 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 085bc7867166b19b1b1c471aa231dac07f332f64
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Sat May 26 00:09:54 2012 +0200
sc ide: unify find-replace panel and command-line into one toolbox
This avoids unnecessary GUI bloat by only allowing one of find,
replace, and command-line panels to be visible at a time.
Also, actions are added to the View menu that control the
visibility of the tool panels.
diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
index 0ab61ef..f67c92b 100644
--- a/editors/sc-ide/CMakeLists.txt
+++ b/editors/sc-ide/CMakeLists.txt
< at >< at > -16,6 +16,8 < at >< at > set ( ide_moc_hdr
widgets/multi_editor.hpp
widgets/doc_list.hpp
widgets/cmd_line.hpp
+ widgets/find_replace_tool.hpp
+ widgets/tool_box.hpp
widgets/documents_dialog.hpp
widgets/code_editor/editor.hpp
widgets/code_editor/highlighter.hpp
< at >< at > -42,6 +44,7 < at >< at > set ( ide_src
widgets/post_window.cpp
widgets/doc_list.cpp
widgets/cmd_line.cpp
+ widgets/find_replace_tool.cpp
widgets/documents_dialog.cpp
widgets/code_editor/editor.cpp
widgets/code_editor/highlighter.cpp
< at >< at > -73,6 +76,14 < at >< at > SET( translations
translations/scide_zh.ts
)
+# QtCollider shared sources:
+list(APPEND ide_moc_hdr
+ ${CMAKE_SOURCE_DIR}/QtCollider/layouts/stack_layout.hpp
+)
+list(APPEND ide_src
+ ${CMAKE_SOURCE_DIR}/QtCollider/layouts/stack_layout.cpp
+)
+
QT4_ADD_TRANSLATION( translations_src ${translations} )
list(APPEND ide_src ${CMAKE_SOURCE_DIR}/common/SC_DirUtils.cpp)
< at >< at > -86,6 +97,8 < at >< at > endif()
include_directories(${CMAKE_SOURCE_DIR}/include/common)
include_directories(${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp-0.3.0/include)
include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
+# For QtCollider headers:
+include_directories(${CMAKE_SOURCE_DIR})
# Needed for auto-generated forms headers:
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/widgets/util)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/widgets)
diff --git a/editors/sc-ide/widgets/find_replace_tool.cpp b/editors/sc-ide/widgets/find_replace_tool.cpp
new file mode 100644
index 0000000..2ea107e
--- /dev/null
+++ b/editors/sc-ide/widgets/find_replace_tool.cpp
< at >< at > -0,0 +1,188 < at >< at >
+/*
+ SuperCollider Qt IDE
+ Copyright (c) 2012 Jakob Leben & Tim Blechmann
+ http://www.audiosynth.com
+
+ This program 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.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "find_replace_tool.hpp"
+#include "code_editor/editor.hpp"
+
+#include <QApplication>
+
+namespace ScIDE {
+
+TextFindReplacePanel::TextFindReplacePanel( QWidget * parent ):
+ QWidget(parent),
+ mMode((Mode) 0), // a hack so that first setMode() works
+ mEditor(0)
+{
+ mFindField = new QLineEdit;
+ mReplaceField = new QLineEdit;
+
+ mNextBtn = new QPushButton(tr("Next"));
+ mPrevBtn = new QPushButton(tr("Previous"));
+ mFindAllBtn = new QPushButton(tr("Find All"));
+ mReplaceBtn = new QPushButton(tr("Replace"));
+ mReplaceAllBtn = new QPushButton(tr("Replace All"));
+
+ mOptionsBtn = new QPushButton(tr("Options"));
+ QMenu *optMenu = new QMenu(this);
+ mMatchCaseAction = optMenu->addAction(tr("Match Case"));
+ mMatchCaseAction->setCheckable(true);
+ mRegExpAction = optMenu->addAction(tr("Regular Expression"));
+ mRegExpAction->setCheckable(true);
+ mWholeWordAction = optMenu->addAction(tr("Whole Words"));
+ mWholeWordAction->setCheckable(true);
+ mOptionsBtn->setMenu(optMenu);
+
+ mFindLabel = new QLabel(tr("Find:"));
+ mFindLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+ mReplaceLabel = new QLabel(tr("Replace:"));
+ mReplaceLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+
+ mGrid = new QGridLayout();
+ mGrid->setContentsMargins(2,2,2,2);
+ mGrid->addWidget(mFindLabel, 0, 0);
+ mGrid->addWidget(mFindField, 0, 1);
+ mGrid->addWidget(mNextBtn, 0, 2);
+ mGrid->addWidget(mPrevBtn, 0, 3);
+ mGrid->addWidget(mFindAllBtn, 0, 4);
+ mGrid->addWidget(mOptionsBtn, 0, 5);
+ mGrid->addWidget(mReplaceLabel, 1, 0);
+ mGrid->addWidget(mReplaceField, 1, 1);
+ mGrid->addWidget(mReplaceBtn, 1, 2);
+ mGrid->addWidget(mReplaceAllBtn, 1, 3);
+ setLayout(mGrid);
+
+ setMode(Find);
+
+ setFocusProxy(mFindField);
+ QWidget::setTabOrder(mFindField, mReplaceField);
+
+ connect(mNextBtn, SIGNAL(clicked()), this, SLOT(findNext()));
+ connect(mPrevBtn, SIGNAL(clicked()), this, SLOT(findPrevious()));
+ connect(mFindAllBtn, SIGNAL(clicked()), this, SLOT(findAll()));
+ connect(mReplaceBtn, SIGNAL(clicked()), this, SLOT(replace()));
+ connect(mReplaceAllBtn, SIGNAL(clicked()), this, SLOT(replaceAll()));
+ connect(mFindField, SIGNAL(returnPressed()), this, SLOT(onFindFieldReturn()));
+ connect(mReplaceField, SIGNAL(returnPressed()), this, SLOT(replace()));
+}
+
+void TextFindReplacePanel::setMode( Mode mode )
+{
+ if (mode == mMode) return;
+
+ mMode = mode;
+
+ bool visible = mMode == Replace;
+ mReplaceLabel->setVisible(visible);
+ mReplaceField->setVisible(visible);
+ mReplaceBtn->setVisible(visible);
+ mReplaceAllBtn->setVisible(visible);
+}
+
+void TextFindReplacePanel::initiate()
+{
+ if(mEditor)
+ {
+ QTextCursor c( mEditor->textCursor() );
+ if(c.hasSelection() &&
+ c.document()->findBlock(c.selectionStart()) ==
+ c.document()->findBlock(c.selectionEnd()))
+ {
+ mFindField->setText(c.selectedText());
+ mReplaceField->clear();
+ }
+ }
+
+ mFindField->selectAll();
+}
+
+QRegExp TextFindReplacePanel::regexp()
+{
+ QRegExp expr(findString());
+ expr.setPatternSyntax(asRegExp() ? QRegExp::RegExp : QRegExp::FixedString);
+ expr.setCaseSensitivity(matchCase() ? Qt::CaseSensitive : Qt::CaseInsensitive);
+ return expr;
+}
+
+QTextDocument::FindFlags TextFindReplacePanel::flags()
+{
+ QTextDocument::FindFlags f;
+ if(wholeWords())
+ f |= QTextDocument::FindWholeWords;
+ return f;
+}
+
+void TextFindReplacePanel::findNext()
+{
+ find(false);
+}
+
+void TextFindReplacePanel::findPrevious()
+{
+ find(true);
+}
+
+void TextFindReplacePanel::onFindFieldReturn()
+{
+ find (QApplication::keyboardModifiers() & Qt::ShiftModifier);
+}
+
+void TextFindReplacePanel::find (bool backwards)
+{
+ if (!mEditor) return;
+
+ QRegExp expr = regexp();
+ if (expr.isEmpty()) return;
+
+ QTextDocument::FindFlags opt = flags();
+ if (backwards)
+ opt |= QTextDocument::FindBackward;
+
+ mEditor->find(expr, opt);
+}
+
+void TextFindReplacePanel::findAll()
+{
+ if (!mEditor) return;
+
+ // NOTE: empty expression removes any search highlighting
+ mEditor->findAll(regexp(), flags());
+}
+
+void TextFindReplacePanel::replace()
+{
+ if (!mEditor) return;
+
+ QRegExp expr = regexp();
+ if (expr.isEmpty()) return;
+
+ mEditor->replace(expr, replaceString(), flags());
+}
+
+void TextFindReplacePanel::replaceAll()
+{
+ if (!mEditor) return;
+
+ QRegExp expr = regexp();
+ if (expr.isEmpty()) return;
+
+ mEditor->replaceAll(expr, replaceString(), flags());
+}
+
+} // namespace ScIDE
diff --git a/editors/sc-ide/widgets/find_replace_tool.hpp b/editors/sc-ide/widgets/find_replace_tool.hpp
new file mode 100644
index 0000000..c5f9ee5
--- /dev/null
+++ b/editors/sc-ide/widgets/find_replace_tool.hpp
< at >< at > -0,0 +1,101 < at >< at >
+/*
+ SuperCollider Qt IDE
+ Copyright (c) 2012 Jakob Leben & Tim Blechmann
+ http://www.audiosynth.com
+
+ This program 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.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef SCIDE_WIDGETS_FIND_REPLACE_TOOL_HPP_INCLUDED
+#define SCIDE_WIDGETS_FIND_REPLACE_TOOL_HPP_INCLUDED
+
+#include <QWidget>
+#include <QPushButton>
+#include <QLabel>
+#include <QLineEdit>
+#include <QGridLayout>
+#include <QTextDocument>
+#include <QAction>
+#include <QMenu>
+
+namespace ScIDE {
+
+class CodeEditor;
+
+class TextFindReplacePanel : public QWidget
+{
+ Q_OBJECT
+
+public:
+ enum Mode
+ {
+ Find = 1,
+ Replace
+ };
+
+public:
+ TextFindReplacePanel( QWidget * parent = 0 );
+
+ void setEditor( CodeEditor *editor ) { mEditor = editor; }
+
+ Mode mode () const { return mMode; }
+ void setMode( Mode );
+ void initiate();
+
+ QString findString() const { return mFindField->text(); }
+ QString replaceString() const { return mReplaceField->text(); }
+ bool matchCase() const { return mMatchCaseAction->isChecked(); }
+ bool asRegExp() const { return mRegExpAction->isChecked(); }
+ bool wholeWords() const { return mWholeWordAction->isChecked(); }
+ QRegExp regexp();
+ QTextDocument::FindFlags flags();
+
+public Q_SLOTS:
+ void findNext();
+ void findPrevious();
+ void findAll();
+ void replace();
+ void replaceAll();
+
+private Q_SLOTS:
+ void onFindFieldReturn();
+
+private:
+ void find (bool backwards);
+
+ QLineEdit *mFindField;
+ QLabel *mFindLabel;
+ QLineEdit *mReplaceField;
+ QLabel *mReplaceLabel;
+ QPushButton *mNextBtn;
+ QPushButton *mPrevBtn;
+ QPushButton *mFindAllBtn;
+ QPushButton *mReplaceBtn;
+ QPushButton *mReplaceAllBtn;
+ QPushButton *mOptionsBtn;
+ QAction *mMatchCaseAction;
+ QAction *mRegExpAction;
+ QAction *mWholeWordAction;
+
+ QGridLayout *mGrid;
+
+ Mode mMode;
+
+ CodeEditor *mEditor;
+};
+
+} // namespace ScIDE
+
+#endif
diff --git a/editors/sc-ide/widgets/main_window.cpp b/editors/sc-ide/widgets/main_window.cpp
index 8a59613..f2820df 100644
--- a/editors/sc-ide/widgets/main_window.cpp
+++ b/editors/sc-ide/widgets/main_window.cpp
< at >< at > -24,6 +24,8 < at >< at >
#include "code_editor/editor.hpp"
#include "multi_editor.hpp"
#include "cmd_line.hpp"
+#include "find_replace_tool.hpp"
+#include "tool_box.hpp"
#include "doc_list.hpp"
#include "post_window.hpp"
#include "settings/dialog.hpp"
< at >< at > -34,6 +36,7 < at >< at >
#include <QMenu>
#include <QMenuBar>
#include <QVBoxLayout>
+#include <QGridLayout>
#include <QApplication>
#include <QMessageBox>
#include <QStatusBar>
< at >< at > -68,22 +71,31 < at >< at > MainWindow::MainWindow(Main * main) :
// Code editor
mEditors = new MultiEditor(main);
+ // Tools
+
+ mCmdLine = new CmdLine("Command Line:");
+ connect(mCmdLine, SIGNAL(invoked(QString, bool)),
+ main->scProcess(), SLOT(evaluateCode(QString, bool)));
+
+ mFindReplaceTool = new TextFindReplacePanel;
+
+ mToolBox = new ToolBox;
+ mToolBox->addWidget(mCmdLine);
+ mToolBox->addWidget(mFindReplaceTool);
+ mToolBox->hide();
+
// Docks
mDocListDock = new DocumentsDock(main->documentManager(), this);
mPostDock = new PostDock(this);
// Layout
- // use a layout for tool widgets, to provide for separate margin control
- QVBoxLayout *tool_box = new QVBoxLayout;
- tool_box->addWidget(cmdLine());
- tool_box->setContentsMargins(5,2,5,2);
-
QVBoxLayout *center_box = new QVBoxLayout;
center_box->setContentsMargins(0,0,0,0);
center_box->setSpacing(0);
center_box->addWidget(mEditors);
- center_box->addLayout(tool_box);
+ center_box->addWidget(mToolBox);
+
QWidget *central = new QWidget;
central->setLayout(center_box);
setCentralWidget(central);
< at >< at > -120,7 +132,10 < at >< at > MainWindow::MainWindow(Main * main) :
this, SLOT(onDocumentChangedExternally(Document*)));
connect(docMng, SIGNAL(recentsChanged()),
this, SLOT(updateRecentDocsMenu()));
+ // ToolBox
+ connect(mToolBox->closeButton(), SIGNAL(clicked()), this, SLOT(hideToolBox()));
+ createActions();
createMenus();
// Initialize recent documents menu
< at >< at > -134,13 +149,11 < at >< at > MainWindow::MainWindow(Main * main) :
QApplication::setWindowIcon(icon);
}
-void MainWindow::createMenus()
+void MainWindow::createActions()
{
Settings::Manager *s = mMain->settings();
s->beginGroup("IDE/shortcuts");
- new QShortcut( tr("Ctrl+Tab", "Toggle command line focus"), this, SLOT(toggleComandLineFocus()) );
-
QAction *act;
// File
< at >< at > -190,13 +203,39 < at >< at > void MainWindow::createMenus()
connect(act, SIGNAL(triggered()),
Main::instance()->documentManager(), SLOT(clearRecents()));
+ // Edit
+
+ mActions[Find] = act = new QAction(
+ QIcon::fromTheme("edit-find"), tr("&Find..."), this);
+ act->setShortcut(tr("Ctrl+F", "Find"));
+ act->setStatusTip(tr("Find text in document"));
+ connect(act, SIGNAL(triggered()), this, SLOT(showFindTool()));
+
+ mActions[Replace] = act = new QAction(
+ QIcon::fromTheme("edit-replace"), tr("&Replace..."), this);
+ act->setShortcut(tr("Ctrl+R", "Replace"));
+ act->setStatusTip(tr("Find and replace text in document"));
+ connect(act, SIGNAL(triggered()), this, SLOT(showReplaceTool()));
+
// View
+
mActions[ShowDocList] = act = new QAction(tr("&Documents"), this);
act->setStatusTip(tr("Show/Hide the Documents dock"));
act->setCheckable(true);
connect(act, SIGNAL(triggered(bool)), mDocListDock, SLOT(setVisible(bool)));
connect(mDocListDock, SIGNAL(visibilityChanged(bool)), act, SLOT(setChecked(bool)));
+ mActions[ShowCmdLine] = act = new QAction(tr("&Command Line"), this);
+ act->setStatusTip(tr("Command line for quick code evaluation"));
+ act->setShortcut(tr("Ctrl+E", "Show command line"));
+ connect(act, SIGNAL(triggered()), this, SLOT(showCmdLine()));
+
+ mActions[CloseToolBox] = act = new QAction(
+ QIcon::fromTheme("window-close"), tr("&Close Tool Panel"), this);
+ act->setStatusTip(tr("Close any open tool panel"));
+ act->setShortcut(tr("Esc", "Close tool box"));
+ connect(act, SIGNAL(triggered()), this, SLOT(hideToolBox()));
+
// Language
mActions[EvaluateCurrentFile] = act = new QAction(
< at >< at > -240,6 +279,13 < at >< at > void MainWindow::createMenus()
s->endGroup(); // IDE/shortcuts;
+ // Add actions to settings
+ for (int i = 0; i < ActionCount; ++i)
+ s->addAction( mActions[i] );
+}
+
+void MainWindow::createMenus()
+{
QMenu *menu;
QMenu *submenu;
< at >< at > -268,8 +314,8 < at >< at > void MainWindow::createMenus()
menu->addAction( mEditors->action(MultiEditor::Copy) );
menu->addAction( mEditors->action(MultiEditor::Paste) );
menu->addSeparator();
- menu->addAction( mEditors->action(MultiEditor::Find) );
- menu->addAction( mEditors->action(MultiEditor::Replace) );
+ menu->addAction( mActions[Find] );
+ menu->addAction( mActions[Replace] );
menu->addSeparator();
menu->addAction( mEditors->action(MultiEditor::IndentMore) );
menu->addAction( mEditors->action(MultiEditor::IndentLess) );
< at >< at > -283,6 +329,13 < at >< at > void MainWindow::createMenus()
submenu->addAction( mActions[ShowDocList] );
menu->addMenu(submenu);
menu->addSeparator();
+ submenu = menu->addMenu(tr("&Tool Panels"));
+ submenu->addAction( mActions[Find] );
+ submenu->addAction( mActions[Replace] );
+ submenu->addAction( mActions[ShowCmdLine] );
+ submenu->addSeparator();
+ submenu->addAction( mActions[CloseToolBox] );
+ menu->addSeparator();
menu->addAction( mEditors->action(MultiEditor::EnlargeFont) );
menu->addAction( mEditors->action(MultiEditor::ShrinkFont) );
menu->addSeparator();
< at >< at > -314,10 +367,6 < at >< at > void MainWindow::createMenus()
menu->addAction( mActions[HelpForSelection] );
menuBar()->addMenu(menu);
-
- // Add actions to settings
- for (int i = 0; i < ActionCount; ++i)
- s->addAction( mActions[i] );
}
QAction *MainWindow::action( ActionRole role )
< at >< at > -361,6 +410,8 < at >< at > void MainWindow::onCurrentDocumentChanged( Document * doc )
mActions[DocSave]->setEnabled(doc);
mActions[DocSaveAs]->setEnabled(doc);
mActions[DocClose]->setEnabled(doc);
+
+ mFindReplaceTool->setEditor( mEditors->currentEditor() );
}
void MainWindow::onDocumentChangedExternally( Document *doc )
< at >< at > -576,6 +627,49 < at >< at > void MainWindow::closeDocument()
MainWindow::close( editor->document() );
}
+void MainWindow::showCmdLine()
+{
+ mToolBox->setCurrentWidget( mCmdLine );
+ mToolBox->show();
+
+ mCmdLine->setFocus(Qt::OtherFocusReason);
+}
+
+void MainWindow::showFindTool()
+{
+ mFindReplaceTool->setMode( TextFindReplacePanel::Find );
+ mFindReplaceTool->initiate();
+
+ mToolBox->setCurrentWidget( mFindReplaceTool );
+ mToolBox->show();
+
+ mFindReplaceTool->setFocus(Qt::OtherFocusReason);
+}
+
+void MainWindow::showReplaceTool()
+{
+ mFindReplaceTool->setMode( TextFindReplacePanel::Replace );
+ mFindReplaceTool->initiate();
+
+ mToolBox->setCurrentWidget( mFindReplaceTool );
+ mToolBox->show();
+
+ mFindReplaceTool->setFocus(Qt::OtherFocusReason);
+}
+
+void MainWindow::hideToolBox()
+{
+ mToolBox->hide();
+ CodeEditor *editor = mEditors->currentEditor();
+ if (editor) {
+ // This slot is mapped to Escape, so also clear highlighting
+ // whenever invoked:
+ editor->clearSearchHighlighting();
+ if (!editor->hasFocus())
+ editor->setFocus(Qt::OtherFocusReason);
+ }
+}
+
void MainWindow::toggleComandLineFocus()
{
QWidget *cmd = cmdLine();
diff --git a/editors/sc-ide/widgets/main_window.hpp b/editors/sc-ide/widgets/main_window.hpp
index eca273f..8fd51b5 100644
--- a/editors/sc-ide/widgets/main_window.hpp
+++ b/editors/sc-ide/widgets/main_window.hpp
< at >< at > -31,6 +31,8 < at >< at > namespace ScIDE
class Main;
class MultiEditor;
+class ToolBox;
+class TextFindReplacePanel;
class PostDock;
class DocumentsDock;
class StatusLabel;
< at >< at > -54,8 +56,14 < at >< at > public:
DocReload,
ClearRecentDocs,
+ // Edit
+ Find,
+ Replace,
+
// View
ShowDocList,
+ ShowCmdLine,
+ CloseToolBox,
// Language
EvaluateCurrentFile,
< at >< at > -94,6 +102,11 < at >< at > public Q_SLOTS:
void reloadDocument();
void closeDocument();
+ void showCmdLine();
+ void showFindTool();
+ void showReplaceTool();
+ void hideToolBox();
+
signals:
void evaluateCode( const QString &, bool silent = true );
< at >< at > -113,6 +126,7 < at >< at > protected:
virtual void closeEvent(QCloseEvent *event);
private:
+ void createActions();
void createMenus();
QWidget *cmdLine();
< at >< at > -123,6 +137,11 < at >< at > private:
MultiEditor *mEditors;
+ // Tools
+ ToolBox *mToolBox;
+ QWidget *mCmdLine;
+ TextFindReplacePanel *mFindReplaceTool;
+
// Status bar
StatusLabel *mLangStatus;
StatusLabel *mSynthStatus;
diff --git a/editors/sc-ide/widgets/multi_editor.cpp b/editors/sc-ide/widgets/multi_editor.cpp
index 6d75d5a..e70939d 100644
--- a/editors/sc-ide/widgets/multi_editor.cpp
+++ b/editors/sc-ide/widgets/multi_editor.cpp
< at >< at > -46,13 +46,9 < at >< at > MultiEditor::MultiEditor( Main *main, QWidget * parent ) :
mTabs->setTabsClosable(true);
mTabs->setMovable(true);
- mFindReplacePanel = new TextFindReplacePanel;
- mFindReplacePanel->setVisible(false);
-
QVBoxLayout *l = new QVBoxLayout;
l->setContentsMargins(0,0,0,0);
l->addWidget(mTabs);
- l->addWidget(mFindReplacePanel);
setLayout(l);
connect(mDocManager, SIGNAL(opened(Document*, int)),
< at >< at > -72,8 +68,6 < at >< at > MultiEditor::MultiEditor( Main *main, QWidget * parent ) :
connect(&mModificationMapper, SIGNAL(mapped(QWidget*)),
this, SLOT(onModificationChanged(QWidget*)));
- connect(mFindReplacePanel, SIGNAL(close()), this, SLOT(hideToolPanel()));
-
connect(main, SIGNAL(applySettingsRequest(Settings::Manager*)),
this, SLOT(applySettings(Settings::Manager*)));
< at >< at > -125,22 +119,6 < at >< at > void MultiEditor::createActions()
act->setStatusTip(tr("Paste text from clipboard"));
mSigMux->connect(act, SIGNAL(triggered()), SLOT(paste()));
- mActions[Find] = act = new QAction(
- QIcon::fromTheme("edit-find"), tr("&Find..."), this);
- act->setShortcut(tr("Ctrl+F", "Find"));
- act->setStatusTip(tr("Find text in document"));
- connect(act, SIGNAL(triggered()), this, SLOT(showFindPanel()));
-
- mActions[Replace] = act = new QAction(
- QIcon::fromTheme("edit-replace"), tr("&Replace..."), this);
- act->setShortcut(tr("Ctrl+R", "Replace"));
- act->setStatusTip(tr("Find and replace text in document"));
- connect(act, SIGNAL(triggered()), this, SLOT(showReplacePanel()));
-
- QShortcut *escShortcut =
- new QShortcut( tr("Esc", "Hide tool panel"), this, SLOT(hideToolPanel()) );
- mSigMux->connect(escShortcut, SIGNAL(activated()), SLOT(clearSearchHighlighting()));
-
mActions[IndentMore] = act = new QAction(
QIcon::fromTheme("format-indent-more"), tr("Indent &More"), this);
act->setStatusTip(tr("Increase indentation of selected lines"));
< at >< at > -220,30 +198,6 < at >< at > void MultiEditor::setCurrent( Document *doc )
mTabs->setCurrentWidget(editor);
}
-void MultiEditor::showFindPanel()
-{
- mFindReplacePanel->setMode( TextFindReplacePanel::Find );
- mFindReplacePanel->initiate();
- mFindReplacePanel->show();
- mFindReplacePanel->setFocus(Qt::OtherFocusReason);
-}
-
-void MultiEditor::showReplacePanel()
-{
- mFindReplacePanel->setMode( TextFindReplacePanel::Replace );
- mFindReplacePanel->initiate();
- mFindReplacePanel->show();
- mFindReplacePanel->setFocus(Qt::OtherFocusReason);
-}
-
-void MultiEditor::hideToolPanel()
-{
- mFindReplacePanel->hide();
- CodeEditor *editor = currentEditor();
- if (editor && !editor->hasFocus())
- editor->setFocus(Qt::OtherFocusReason);
-}
-
void MultiEditor::onOpen( Document *doc, int pos )
{
CodeEditor *editor = new CodeEditor();
< at >< at > -306,8 +260,6 < at >< at > void MultiEditor::onCurrentChanged( int index )
editor->setFocus(Qt::OtherFocusReason);
}
- mFindReplacePanel->setEditor(editor);
-
updateActions();
Q_EMIT( currentChanged( editor ? editor->document() : 0 ) );
< at >< at > -350,174 +302,4 < at >< at > void MultiEditor::openClassDefinition()
Main::instance()->scProcess()->getClassDefinitions(selectedText);
}
-
-////////////////////// TextFindReplacePanel //////////////////////////
-
-TextFindReplacePanel::TextFindReplacePanel( QWidget * parent ):
- QWidget(parent),
- mMode((Mode) 0), // a hack so that first setMode() works
- mEditor(0)
-{
- mCloseBtn = new QToolButton;
- mCloseBtn->setIcon(QIcon::fromTheme("window-close"));
- mCloseBtn->setAutoRaise(true);
-
- mFindField = new QLineEdit;
- mReplaceField = new QLineEdit;
-
- mNextBtn = new QPushButton(tr("Next"));
- mPrevBtn = new QPushButton(tr("Previous"));
- mFindAllBtn = new QPushButton(tr("Find All"));
- mReplaceBtn = new QPushButton(tr("Replace"));
- mReplaceAllBtn = new QPushButton(tr("Replace All"));
-
- mOptionsBtn = new QPushButton(tr("Options"));
- QMenu *optMenu = new QMenu(this);
- mMatchCaseAction = optMenu->addAction(tr("Match Case"));
- mMatchCaseAction->setCheckable(true);
- mRegExpAction = optMenu->addAction(tr("Regular Expression"));
- mRegExpAction->setCheckable(true);
- mWholeWordAction = optMenu->addAction(tr("Whole Words"));
- mWholeWordAction->setCheckable(true);
- mOptionsBtn->setMenu(optMenu);
-
- mFindLabel = new QLabel(tr("Find:"));
- mFindLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
- mReplaceLabel = new QLabel(tr("Replace:"));
- mReplaceLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-
- mGrid = new QGridLayout();
- mGrid->setContentsMargins(2,2,2,2);
- mGrid->addWidget(mCloseBtn, 0, 0);
- mGrid->addWidget(mFindLabel, 0, 1);
- mGrid->addWidget(mFindField, 0, 2);
- mGrid->addWidget(mNextBtn, 0, 3);
- mGrid->addWidget(mPrevBtn, 0, 4);
- mGrid->addWidget(mFindAllBtn, 0, 5);
- mGrid->addWidget(mOptionsBtn, 0, 6);
- mGrid->addWidget(mReplaceLabel, 1, 1);
- mGrid->addWidget(mReplaceField, 1, 2);
- mGrid->addWidget(mReplaceBtn, 1, 3);
- mGrid->addWidget(mReplaceAllBtn, 1, 4);
- setLayout(mGrid);
-
- setMode(Find);
-
- setFocusProxy(mFindField);
- QWidget::setTabOrder(mFindField, mReplaceField);
-
- connect(mCloseBtn, SIGNAL(clicked()), this, SIGNAL(close()));
- connect(mNextBtn, SIGNAL(clicked()), this, SLOT(findNext()));
- connect(mPrevBtn, SIGNAL(clicked()), this, SLOT(findPrevious()));
- connect(mFindAllBtn, SIGNAL(clicked()), this, SLOT(findAll()));
- connect(mReplaceBtn, SIGNAL(clicked()), this, SLOT(replace()));
- connect(mReplaceAllBtn, SIGNAL(clicked()), this, SLOT(replaceAll()));
- connect(mFindField, SIGNAL(returnPressed()), this, SLOT(onFindFieldReturn()));
- connect(mReplaceField, SIGNAL(returnPressed()), this, SLOT(replace()));
-}
-
-void TextFindReplacePanel::setMode( Mode mode )
-{
- if (mode == mMode) return;
-
- mMode = mode;
-
- bool visible = mMode == Replace;
- mReplaceLabel->setVisible(visible);
- mReplaceField->setVisible(visible);
- mReplaceBtn->setVisible(visible);
- mReplaceAllBtn->setVisible(visible);
-}
-
-void TextFindReplacePanel::initiate()
-{
- if(mEditor)
- {
- QTextCursor c( mEditor->textCursor() );
- if(c.hasSelection() &&
- c.document()->findBlock(c.selectionStart()) ==
- c.document()->findBlock(c.selectionEnd()))
- {
- mFindField->setText(c.selectedText());
- mReplaceField->clear();
- }
- }
-
- mFindField->selectAll();
-}
-
-QRegExp TextFindReplacePanel::regexp()
-{
- QRegExp expr(findString());
- expr.setPatternSyntax(asRegExp() ? QRegExp::RegExp : QRegExp::FixedString);
- expr.setCaseSensitivity(matchCase() ? Qt::CaseSensitive : Qt::CaseInsensitive);
- return expr;
-}
-
-QTextDocument::FindFlags TextFindReplacePanel::flags()
-{
- QTextDocument::FindFlags f;
- if(wholeWords())
- f |= QTextDocument::FindWholeWords;
- return f;
-}
-
-void TextFindReplacePanel::findNext()
-{
- find(false);
-}
-
-void TextFindReplacePanel::findPrevious()
-{
- find(true);
-}
-
-void TextFindReplacePanel::onFindFieldReturn()
-{
- find (QApplication::keyboardModifiers() & Qt::ShiftModifier);
-}
-
-void TextFindReplacePanel::find (bool backwards)
-{
- if (!mEditor) return;
-
- QRegExp expr = regexp();
- if (expr.isEmpty()) return;
-
- QTextDocument::FindFlags opt = flags();
- if (backwards)
- opt |= QTextDocument::FindBackward;
-
- mEditor->find(expr, opt);
-}
-
-void TextFindReplacePanel::findAll()
-{
- if (!mEditor) return;
-
- // NOTE: empty expression removes any search highlighting
- mEditor->findAll(regexp(), flags());
-}
-
-void TextFindReplacePanel::replace()
-{
- if (!mEditor) return;
-
- QRegExp expr = regexp();
- if (expr.isEmpty()) return;
-
- mEditor->replace(expr, replaceString(), flags());
-}
-
-void TextFindReplacePanel::replaceAll()
-{
- if (!mEditor) return;
-
- QRegExp expr = regexp();
- if (expr.isEmpty()) return;
-
- mEditor->replaceAll(expr, replaceString(), flags());
-}
-
-
} // namespace ScIDE
diff --git a/editors/sc-ide/widgets/multi_editor.hpp b/editors/sc-ide/widgets/multi_editor.hpp
index 1809ba6..6cf63a5 100644
--- a/editors/sc-ide/widgets/multi_editor.hpp
+++ b/editors/sc-ide/widgets/multi_editor.hpp
< at >< at > -43,8 +43,6 < at >< at > class SignalMultiplexer;
namespace Settings { class Manager; }
-class TextFindReplacePanel;
-
class MultiEditor : public QWidget
{
Q_OBJECT
< at >< at > -59,8 +57,6 < at >< at > public:
Cut,
Copy,
Paste,
- Find,
- Replace,
IndentMore,
IndentLess,
< at >< at > -94,10 +90,6 < at >< at > public Q_SLOTS:
void setCurrent( Document * );
- void showFindPanel();
- void showReplacePanel();
- void hideToolPanel();
-
void applySettings( Settings::Manager * );
private Q_SLOTS:
< at >< at > -124,79 +116,12 < at >< at > private:
// gui
QTabWidget *mTabs;
- TextFindReplacePanel *mFindReplacePanel;
QIcon mDocModifiedIcon;
// settings
bool mStepForwardEvaluation;
};
-class TextFindReplacePanel : public QWidget
-{
- Q_OBJECT
-
-public:
- enum Mode
- {
- Find = 1,
- Replace
- };
-
-public:
- TextFindReplacePanel( QWidget * parent = 0 );
-
- void setEditor( CodeEditor *editor ) { mEditor = editor; }
-
- Mode mode () const { return mMode; }
- void setMode( Mode );
- void initiate();
-
- QString findString() const { return mFindField->text(); }
- QString replaceString() const { return mReplaceField->text(); }
- bool matchCase() const { return mMatchCaseAction->isChecked(); }
- bool asRegExp() const { return mRegExpAction->isChecked(); }
- bool wholeWords() const { return mWholeWordAction->isChecked(); }
- QRegExp regexp();
- QTextDocument::FindFlags flags();
-
-public Q_SLOTS:
- void findNext();
- void findPrevious();
- void findAll();
- void replace();
- void replaceAll();
-
-Q_SIGNALS:
- void close();
-
-private Q_SLOTS:
- void onFindFieldReturn();
-
-private:
- void find (bool backwards);
-
- QToolButton *mCloseBtn;
- QLineEdit *mFindField;
- QLabel *mFindLabel;
- QLineEdit *mReplaceField;
- QLabel *mReplaceLabel;
- QPushButton *mNextBtn;
- QPushButton *mPrevBtn;
- QPushButton *mFindAllBtn;
- QPushButton *mReplaceBtn;
- QPushButton *mReplaceAllBtn;
- QPushButton *mOptionsBtn;
- QAction *mMatchCaseAction;
- QAction *mRegExpAction;
- QAction *mWholeWordAction;
-
- QGridLayout *mGrid;
-
- Mode mMode;
-
- CodeEditor *mEditor;
-};
-
} // namespace ScIDE
#endif // SCIDE_WIDGETS_MULTI_EDITOR_HPP_INCLUDED
diff --git a/editors/sc-ide/widgets/tool_box.hpp b/editors/sc-ide/widgets/tool_box.hpp
new file mode 100644
index 0000000..d4b3f56
--- /dev/null
+++ b/editors/sc-ide/widgets/tool_box.hpp
< at >< at > -0,0 +1,72 < at >< at >
+/*
+ SuperCollider Qt IDE
+ Copyright (c) 2012 Jakob Leben & Tim Blechmann
+ http://www.audiosynth.com
+
+ This program 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.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef SCIDE_WIDGETS_TOOL_BOX_HPP_INCLUDED
+#define SCIDE_WIDGETS_TOOL_BOX_HPP_INCLUDED
+
+#include <QtCollider/layouts/stack_layout.hpp>
+
+#include <QWidget>
+#include <QToolButton>
+#include <QGridLayout>
+
+namespace ScIDE {
+
+class ToolBox : public QWidget
+{
+ Q_OBJECT
+
+public:
+ ToolBox( QWidget * parent = 0 ): QWidget(parent)
+ {
+ mCloseBtn = new QToolButton;
+ mCloseBtn->setIcon(QIcon::fromTheme("window-close"));
+ mCloseBtn->setText("X");
+ mCloseBtn->setAutoRaise(true);
+
+ mStack = new QtCollider::StackLayout;
+
+ QGridLayout *grid = new QGridLayout;
+ grid->addWidget(mCloseBtn, 0, 0);
+ grid->addLayout(mStack, 0, 1, 2, 1);
+
+ setLayout(grid);
+ }
+
+ QAbstractButton *closeButton() { return mCloseBtn; }
+
+ void addWidget ( QWidget *w ) { mStack->addWidget(w); }
+
+ int currentIndex () const { return mStack->currentIndex(); }
+
+ QWidget * currentWidget() const { return mStack->currentWidget(); }
+
+ void setCurrentWidget ( QWidget *w ) { mStack->setCurrentWidget(w); }
+
+ void setCurrentIndex ( int i ) { mStack->setCurrentIndex(i); }
+
+private:
+ QtCollider::StackLayout *mStack;
+ QToolButton *mCloseBtn;
+};
+
+} // namespace ScIDE
+
+#endif
commit f21a4ed0a26f3979c353232716dd255d5d32d7c7
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Sat May 26 01:23:15 2012 +0200
qtcollider: StackLayout: calculate size policies based on stacking mode
When stacking mode is StackOne (only one widget visible at a time), only
include that widget in calculation of sizeHint() and minimumSizeHint().
Moreover, implement expandingDirections() following the same principle.
diff --git a/QtCollider/layouts/stack_layout.cpp b/QtCollider/layouts/stack_layout.cpp
index 837a232..9aee8af 100644
--- a/QtCollider/layouts/stack_layout.cpp
+++ b/QtCollider/layouts/stack_layout.cpp
< at >< at > -146,6 +146,10 < at >< at > void StackLayout::setCurrentIndex(int index)
}
if (reenableUpdates)
parent->setUpdatesEnabled(true);
+
+ if (_mode == StackOne)
+ // expandingDirections() might have changed, so invalidate():
+ invalidate();
}
int StackLayout::currentIndex() const
< at >< at > -194,17 +198,35 < at >< at > void StackLayout::addItem(QLayoutItem *item)
QSize StackLayout::sizeHint() const
{
QSize s(0, 0);
- int n = _list.count();
-
- for (int i = 0; i < n; ++i)
- if (QWidget *widget = _list.at(i)->widget()) {
- QSize ws(widget->sizeHint());
- if (widget->sizePolicy().horizontalPolicy() == QSizePolicy::Ignored)
- ws.setWidth(0);
- if (widget->sizePolicy().verticalPolicy() == QSizePolicy::Ignored)
- ws.setHeight(0);
- s = s.expandedTo(ws);
- }
+
+ switch (_mode)
+ {
+ case StackOne:
+ if (_index >= 0)
+ if (QWidget *w = _list.at(_index)->widget()) {
+ if (w->sizePolicy().horizontalPolicy() != QSizePolicy::Ignored)
+ s.setWidth(w->sizeHint().width());
+ if (w->sizePolicy().verticalPolicy() != QSizePolicy::Ignored)
+ s.setHeight(w->sizeHint().height());
+ }
+ break;
+
+ case StackAll:
+ {
+ int n = _list.count();
+ for (int i = 0; i < n; ++i)
+ if (QWidget *w = _list.at(i)->widget()) {
+ QSize ws(w->sizeHint());
+ if (w->sizePolicy().horizontalPolicy() == QSizePolicy::Ignored)
+ ws.setWidth(0);
+ if (w->sizePolicy().verticalPolicy() == QSizePolicy::Ignored)
+ ws.setHeight(0);
+ s = s.expandedTo(ws);
+ }
+ break;
+ }
+ }
+
return s;
}
< at >< at > -241,17 +263,56 < at >< at > static QSize smartMinSize(const QSize &sizeHint, const QSize &minSizeHint,
QSize StackLayout::minimumSize() const
{
QSize s(0, 0);
- int n = _list.count();
-
- for (int i = 0; i < n; ++i)
- if (QWidget *w = _list.at(i)->widget())
- s = s.expandedTo(
- smartMinSize(w->sizeHint(), w->minimumSizeHint(),
- w->minimumSize(), w->maximumSize(),
- w->sizePolicy()));
+
+ switch (_mode)
+ {
+ case StackOne:
+ if (_index >= 0)
+ if (QWidget *w = _list.at(_index)->widget())
+ s = smartMinSize(w->sizeHint(), w->minimumSizeHint(),
+ w->minimumSize(), w->maximumSize(),
+ w->sizePolicy());
+ break;
+
+ case StackAll:
+ {
+ int n = _list.count();
+ for (int i = 0; i < n; ++i)
+ if (QWidget *w = _list.at(i)->widget())
+ s = s.expandedTo(
+ smartMinSize(w->sizeHint(), w->minimumSizeHint(),
+ w->minimumSize(), w->maximumSize(),
+ w->sizePolicy()));
+ break;
+ }
+ }
+
return s;
}
+Qt::Orientations StackLayout::expandingDirections () const
+{
+ Qt::Orientations directions;
+
+ switch (_mode)
+ {
+ case StackOne:
+ directions = _index >= 0 ? _list.at(_index)->expandingDirections() : (Qt::Orientations) 0;
+ break;
+
+ case StackAll:
+ {
+ Qt::Orientations directions = 0;
+ int n = _list.count();
+ for (int i = 0; i < n; ++i)
+ directions |= _list.at(i)->expandingDirections();
+ break;
+ }
+ }
+
+ return directions;
+}
+
void StackLayout::setGeometry(const QRect &rect)
{
switch (_mode) {
< at >< at > -307,6 +368,8 < at >< at > void StackLayout::setStackingMode(StackingMode stackingMode)
}
break;
}
+
+ invalidate();
}
void StackLayout::invalidate()
diff --git a/QtCollider/layouts/stack_layout.hpp b/QtCollider/layouts/stack_layout.hpp
index 04a827d..fa24e7f 100644
--- a/QtCollider/layouts/stack_layout.hpp
+++ b/QtCollider/layouts/stack_layout.hpp
< at >< at > -70,6 +70,7 < at >< at > public:
QLayoutItem *takeAt(int);
QSize sizeHint() const;
QSize minimumSize() const;
+ Qt::Orientations expandingDirections () const;
void setGeometry(const QRect &rect);
virtual void invalidate();
commit 391cc4b1c2af98adae424da7cafcbab63f6919d8
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Sat May 26 00:17:03 2012 +0200
qtcollider: separate QtCollider::StackLayout to support reuse
Make our custom reimplementation of QStackedLayout independent from
QtCollider code so it can be reused outside of QtCollider (e.g. in the
Qt IDE).
Effectively, the QcStackLayout is split into two classes:
* QtCollider::StackLayout = generic implementation.
* QcStackLayout = subclass of the above with the addition of QtCollider
specifics
diff --git a/QtCollider/layouts/layouts.cpp b/QtCollider/layouts/layouts.cpp
index 67e5b85..e98f29c 100644
--- a/QtCollider/layouts/layouts.cpp
+++ b/QtCollider/layouts/layouts.cpp
< at >< at > -24,6 +24,7 < at >< at >
QC_DECLARE_QOBJECT_FACTORY(QcHBoxLayout);
QC_DECLARE_QOBJECT_FACTORY(QcVBoxLayout);
QC_DECLARE_QOBJECT_FACTORY(QcGridLayout);
+QC_DECLARE_QOBJECT_FACTORY(QcStackLayout);
void QcGridLayout::addItem( const VariantList &dataList )
{
diff --git a/QtCollider/layouts/layouts.hpp b/QtCollider/layouts/layouts.hpp
index f030743..395296a 100644
--- a/QtCollider/layouts/layouts.hpp
+++ b/QtCollider/layouts/layouts.hpp
< at >< at > -22,7 +22,10 < at >< at >
#ifndef QC_LAYOUTS_H
#define QC_LAYOUTS_H
+#include "stack_layout.hpp"
+#include "../Common.h"
#include "../QcObjectFactory.h"
+#include "../QObjectProxy.h"
#include <QHBoxLayout>
#include <QVBoxLayout>
< at >< at > -252,4 +255,29 < at >< at > public:
}
};
+class QcStackLayout : public QcLayout<QtCollider::StackLayout>
+{
+ Q_OBJECT
+ Q_PROPERTY( VariantList margins READ margins WRITE setMargins )
+
+public:
+ QcStackLayout() {}
+
+ Q_INVOKABLE QcStackLayout( const VariantList &items )
+ {
+ Q_FOREACH(QVariant var, items.data) {
+ QObjectProxy *p = var.value<QObjectProxy*>();
+ if(!p) return;
+ QWidget *w = qobject_cast<QWidget*>( p->object() );
+ if(w) addWidget(w);
+ }
+ }
+
+ Q_INVOKABLE void insertWidget( int index, QObjectProxy *proxy )
+ {
+ if (QWidget *w = qobject_cast<QWidget*>( proxy->object() ))
+ QtCollider::StackLayout::insertWidget(index, w);
+ }
+};
+
#endif
diff --git a/QtCollider/layouts/stack_layout.cpp b/QtCollider/layouts/stack_layout.cpp
index 6a1f4c5..837a232 100644
--- a/QtCollider/layouts/stack_layout.cpp
+++ b/QtCollider/layouts/stack_layout.cpp
< at >< at > -27,38 +27,25 < at >< at >
#include <QWidget>
-QC_DECLARE_QOBJECT_FACTORY(QcStackLayout);
+namespace QtCollider {
-QcStackLayout::QcStackLayout() :
+StackLayout::StackLayout() :
_index(-1),
_mode(StackOne),
_gotParent(false)
{}
-QcStackLayout::QcStackLayout( const VariantList &items ) :
- _index(-1),
- _mode(StackOne),
- _gotParent(false)
-{
- Q_FOREACH(QVariant var, items.data) {
- QObjectProxy *p = var.value<QObjectProxy*>();
- if(!p) return;
- QWidget *w = qobject_cast<QWidget*>( p->object() );
- if(w) addWidget(w);
- }
-}
-
-QcStackLayout::~QcStackLayout()
+StackLayout::~StackLayout()
{
qDeleteAll(_list);
}
-int QcStackLayout::addWidget(QWidget *widget)
+int StackLayout::addWidget(QWidget *widget)
{
return insertWidget(_list.count(), widget);
}
-int QcStackLayout::insertWidget(int index, QWidget *widget)
+int StackLayout::insertWidget(int index, QWidget *widget)
{
addChildWidget(widget);
index = qMin(index, _list.count());
< at >< at > -79,12 +66,12 < at >< at > int QcStackLayout::insertWidget(int index, QWidget *widget)
return index;
}
-QLayoutItem *QcStackLayout::itemAt(int index) const
+QLayoutItem *StackLayout::itemAt(int index) const
{
return _list.value(index);
}
-QLayoutItem *QcStackLayout::takeAt(int index)
+QLayoutItem *StackLayout::takeAt(int index)
{
if (index < 0 || index >= _list.size())
return 0;
< at >< at > -103,7 +90,7 < at >< at > QLayoutItem *QcStackLayout::takeAt(int index)
return item;
}
-void QcStackLayout::setCurrentIndex(int index)
+void StackLayout::setCurrentIndex(int index)
{
QWidget *prev = currentWidget();
QWidget *next = widget(index);
< at >< at > -161,50 +148,50 < at >< at > void QcStackLayout::setCurrentIndex(int index)
parent->setUpdatesEnabled(true);
}
-int QcStackLayout::currentIndex() const
+int StackLayout::currentIndex() const
{
return _index;
}
-void QcStackLayout::setCurrentWidget(QWidget *widget)
+void StackLayout::setCurrentWidget(QWidget *widget)
{
int index = indexOf(widget);
if (index == -1) {
- qWarning("QcStackLayout::setCurrentWidget: Widget %p not contained in stack", widget);
+ qWarning("StackLayout::setCurrentWidget: Widget %p not contained in stack", widget);
return;
}
setCurrentIndex(index);
}
-QWidget *QcStackLayout::currentWidget() const
+QWidget *StackLayout::currentWidget() const
{
return _index >= 0 ? _list.at(_index)->widget() : 0;
}
-QWidget *QcStackLayout::widget(int index) const
+QWidget *StackLayout::widget(int index) const
{
if (index < 0 || index >= _list.size())
return 0;
return _list.at(index)->widget();
}
-int QcStackLayout::count() const
+int StackLayout::count() const
{
return _list.size();
}
-void QcStackLayout::addItem(QLayoutItem *item)
+void StackLayout::addItem(QLayoutItem *item)
{
QWidget *widget = item->widget();
if (widget) {
addWidget(widget);
delete item;
} else {
- qWarning("QcStackLayout::addItem: Only widgets can be added");
+ qWarning("StackLayout::addItem: Only widgets can be added");
}
}
-QSize QcStackLayout::sizeHint() const
+QSize StackLayout::sizeHint() const
{
QSize s(0, 0);
int n = _list.count();
< at >< at > -251,7 +238,7 < at >< at > static QSize smartMinSize(const QSize &sizeHint, const QSize &minSizeHint,
return s.expandedTo(QSize(0,0));
}
-QSize QcStackLayout::minimumSize() const
+QSize StackLayout::minimumSize() const
{
QSize s(0, 0);
int n = _list.count();
< at >< at > -265,7 +252,7 < at >< at > QSize QcStackLayout::minimumSize() const
return s;
}
-void QcStackLayout::setGeometry(const QRect &rect)
+void StackLayout::setGeometry(const QRect &rect)
{
switch (_mode) {
case StackOne:
< at >< at > -281,12 +268,12 < at >< at > void QcStackLayout::setGeometry(const QRect &rect)
}
}
-QcStackLayout::StackingMode QcStackLayout::stackingMode() const
+StackLayout::StackingMode StackLayout::stackingMode() const
{
return _mode;
}
-void QcStackLayout::setStackingMode(StackingMode stackingMode)
+void StackLayout::setStackingMode(StackingMode stackingMode)
{
if (_mode == stackingMode)
return;
< at >< at > -322,7 +309,7 < at >< at > void QcStackLayout::setStackingMode(StackingMode stackingMode)
}
}
-void QcStackLayout::invalidate()
+void StackLayout::invalidate()
{
QWidget *pw = parentWidget();
< at >< at > -364,3 +351,5 < at >< at > void QcStackLayout::invalidate()
QLayout::invalidate();
}
+
+} // namespace QtCollider
diff --git a/QtCollider/layouts/stack_layout.hpp b/QtCollider/layouts/stack_layout.hpp
index 2305352..04a827d 100644
--- a/QtCollider/layouts/stack_layout.hpp
+++ b/QtCollider/layouts/stack_layout.hpp
< at >< at > -23,41 +23,30 < at >< at >
*
************************************************************************/
-#ifndef QC_STACK_LAYOUT_HPP
-#define QC_STACK_LAYOUT_HPP
-
-#include "layouts.hpp"
-#include "../Common.h"
-#include "../QObjectProxy.h"
+#ifndef QT_COLLIDER_STACK_LAYOUT_HPP_INCLUDED
+#define QT_COLLIDER_STACK_LAYOUT_HPP_INCLUDED
#include <QLayout>
#include <QList>
-class QcStackLayout : public QcLayout<QLayout>
+namespace QtCollider {
+
+class StackLayout : public QLayout
{
Q_OBJECT
Q_ENUMS(StackingMode)
- Q_PROPERTY( VariantList margins READ margins WRITE setMargins )
Q_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex )
Q_PROPERTY( StackingMode stackingMode READ stackingMode WRITE setStackingMode )
Q_PROPERTY( int count READ count )
public:
- Q_INVOKABLE QcStackLayout( const VariantList &items );
-
- Q_INVOKABLE void insertWidget( int index, QObjectProxy *proxy ) {
- QWidget *w = qobject_cast<QWidget*>( proxy->object() );
- if( w ) insertWidget(index, w);
- }
-
-public:
enum StackingMode {
StackOne,
StackAll
};
- QcStackLayout();
- ~QcStackLayout();
+ StackLayout();
+ ~StackLayout();
int addWidget(QWidget *w);
int insertWidget(int index, QWidget *w);
< at >< at > -92,4 +81,6 < at >< at > private:
bool _gotParent;
};
-#endif // QC_STACK_LAYOUT_HPP
+} // namespace QtCollider
+
+#endif // QT_COLLIDER_STACK_LAYOUT_HPP_INCLUDED
-----------------------------------------------------------------------
Summary of changes:
QtCollider/layouts/layouts.cpp | 1 +
QtCollider/layouts/layouts.hpp | 28 ++++
QtCollider/layouts/stack_layout.cpp | 160 +++++++++++++-------
QtCollider/layouts/stack_layout.hpp | 30 ++---
editors/sc-ide/CMakeLists.txt | 13 ++
editors/sc-ide/widgets/find_replace_tool.cpp | 188 ++++++++++++++++++++++
editors/sc-ide/widgets/find_replace_tool.hpp | 101 ++++++++++++
editors/sc-ide/widgets/main_window.cpp | 124 +++++++++++++--
editors/sc-ide/widgets/main_window.hpp | 19 +++
editors/sc-ide/widgets/multi_editor.cpp | 218 --------------------------
editors/sc-ide/widgets/multi_editor.hpp | 75 ---------
editors/sc-ide/widgets/tool_box.hpp | 72 +++++++++
12 files changed, 648 insertions(+), 381 deletions(-)
create mode 100644 editors/sc-ide/widgets/find_replace_tool.cpp
create mode 100644 editors/sc-ide/widgets/find_replace_tool.hpp
create mode 100644 editors/sc-ide/widgets/tool_box.hpp
hooks/post-receive
</pre>
Jakob Leben
2012-05-26T00:12:29
-
Call For Open Source Software Competition
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50931
<pre>Hi -
Anyone fancy putting something together for this?
Call For Open Source Software Competition
http://www.acmmm12.org/call-for-open-source-software-competition/
SuperCollider would fit the remit. Entering the competition involves
writing a 4-page paper describing the software...
Dan
_______________________________________________
sc-dev mailing list
info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/
</pre>
Dan Stowell
2012-05-25T10:38:45
-
SF.net Git: supercollider branch, 3.5, updated. 06a962956d04cb53059481a7ec4e24de04b8ddaf
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50929
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, 3.5 has been updated
via 06a962956d04cb53059481a7ec4e24de04b8ddaf (commit)
from c3471187db047e02880f8a3fa7ae85479953967e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 06a962956d04cb53059481a7ec4e24de04b8ddaf
Author: Jonatan Liljedahl <lijon-fwFeWneuYPZWk0Htik3J/w< at >public.gmane.org>
Date: Fri May 25 11:52:59 2012 +0200
Methods.html: auto-redirect to Search if method not found
diff --git a/HelpSource/Overviews/Methods.html b/HelpSource/Overviews/Methods.html
index 5ae799d..b97acf8 100644
--- a/HelpSource/Overviews/Methods.html
+++ b/HelpSource/Overviews/Methods.html
< at >< at > -231,6 +231,7 < at >< at > function showmethods() {
var div = document.createElement("p");
div.appendChild(document.createTextNode("Method not found: "+hash));
res.appendChild(div);
+ window.location = "../Search.html#"+hash;
return;
}
-----------------------------------------------------------------------
Summary of changes:
HelpSource/Overviews/Methods.html | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
</pre>
Jonatan Liljedahl
2012-05-25T09:55:39
-
SF.net Git: supercollider branch, master, updated. 8f471ec1f61187ef8969eb2860cee288cd27c989
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50928
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via 8f471ec1f61187ef8969eb2860cee288cd27c989 (commit)
from ada1d13ca305c857104045a12f015a5cd28eca78 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8f471ec1f61187ef8969eb2860cee288cd27c989
Author: Jonatan Liljedahl <lijon-fwFeWneuYPZWk0Htik3J/w< at >public.gmane.org>
Date: Fri May 25 11:52:59 2012 +0200
Methods.html: auto-redirect to Search if method not found
diff --git a/HelpSource/Overviews/Methods.html b/HelpSource/Overviews/Methods.html
index 5ae799d..b97acf8 100644
--- a/HelpSource/Overviews/Methods.html
+++ b/HelpSource/Overviews/Methods.html
< at >< at > -231,6 +231,7 < at >< at > function showmethods() {
var div = document.createElement("p");
div.appendChild(document.createTextNode("Method not found: "+hash));
res.appendChild(div);
+ window.location = "../Search.html#"+hash;
return;
}
-----------------------------------------------------------------------
Summary of changes:
HelpSource/Overviews/Methods.html | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
</pre>
Jonatan Liljedahl
2012-05-25T09:55:12
-
SF.net Git: supercollider branch, master, updated. ada1d13ca305c857104045a12f015a5cd28eca78
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50912
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via ada1d13ca305c857104045a12f015a5cd28eca78 (commit)
via e8540406a7365bea7cc5a69a09b4d7b8f31fab9f (commit)
from 55bc16987f9dac0ba91412fe15644ab2f46044e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ada1d13ca305c857104045a12f015a5cd28eca78
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Thu May 24 19:09:45 2012 +0200
sc ide: ask for confirmation when closing document via tab button
diff --git a/editors/sc-ide/widgets/multi_editor.cpp b/editors/sc-ide/widgets/multi_editor.cpp
index 7164a6c..6d75d5a 100644
--- a/editors/sc-ide/widgets/multi_editor.cpp
+++ b/editors/sc-ide/widgets/multi_editor.cpp
< at >< at > -19,6 +19,7 < at >< at >
*/
#include "multi_editor.hpp"
+#include "main_window.hpp"
#include "code_editor/editor.hpp"
#include "../core/doc_manager.hpp"
#include "../core/sig_mux.hpp"
< at >< at > -293,7 +294,7 < at >< at > void MultiEditor::onCloseRequest( int index )
{
CodeEditor *editor = editorForTab( index );
if(editor)
- mDocManager->close(editor->document());
+ MainWindow::close(editor->document());
}
void MultiEditor::onCurrentChanged( int index )
commit e8540406a7365bea7cc5a69a09b4d7b8f31fab9f
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Thu May 24 19:01:53 2012 +0200
sc ide: shortcut settings GUI: fix potential null pointer dereference
diff --git a/editors/sc-ide/widgets/settings/shortcuts_page.cpp b/editors/sc-ide/widgets/settings/shortcuts_page.cpp
index 73d721f..131ac1e 100644
--- a/editors/sc-ide/widgets/settings/shortcuts_page.cpp
+++ b/editors/sc-ide/widgets/settings/shortcuts_page.cpp
< at >< at > -152,13 +152,11 < at >< at > void ShortcutsPage::filterBy( const QString &str )
void ShortcutsPage::showItem( QTreeWidgetItem *item, QTreeWidgetItem *prev )
{
- QAction *a = item->data(0, ActionRole).value<QAction*>();
- Q_ASSERT(a);
+ QVariant defaultSeqVar = item ? item->data(0, DefaultSequenceRole) : QVariant();
+ QString defaultSeq = defaultSeqVar.value<QKeySequence>().toString(QKeySequence::NativeText);
+ ui->defaultSeq->setText(defaultSeq);
- QString defaultSeq = item->data(0, DefaultSequenceRole).toString();
- ui->defaultSeq->setText( defaultSeq );
-
- QVariant customSeqVar = item->data(0, CustomSequenceRole);
+ QVariant customSeqVar = item ? item->data(0, CustomSequenceRole) : QVariant();
ui->customSeq->setSequence( customSeqVar.value<QKeySequence>() );
if (customSeqVar.isValid())
-----------------------------------------------------------------------
Summary of changes:
editors/sc-ide/widgets/multi_editor.cpp | 3 ++-
editors/sc-ide/widgets/settings/shortcuts_page.cpp | 10 ++++------
2 files changed, 6 insertions(+), 7 deletions(-)
hooks/post-receive
</pre>
Jakob Leben
2012-05-24T17:14:06
-
SF.net Git: supercollider branch, master, updated. 55bc16987f9dac0ba91412fe15644ab2f46044e7
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50910
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via 55bc16987f9dac0ba91412fe15644ab2f46044e7 (commit)
from 0ba3c32734b98d58cf5569fc65e2627ea492ce17 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 55bc16987f9dac0ba91412fe15644ab2f46044e7
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Thu May 24 18:46:40 2012 +0200
sc ide: merge Evaluate Region and Evaluate Selection actions
Evaluate Region action will now evaluate the current selection if any,
or the current region if any, or the current line.
diff --git a/editors/sc-ide/widgets/main_window.cpp b/editors/sc-ide/widgets/main_window.cpp
index c86ea0a..8a59613 100644
--- a/editors/sc-ide/widgets/main_window.cpp
+++ b/editors/sc-ide/widgets/main_window.cpp
< at >< at > -204,15 +204,9 < at >< at > void MainWindow::createMenus()
act->setStatusTip(tr("Evaluate current File"));
connect(act, SIGNAL(triggered()), this, SLOT(evaluateCurrentFile()));
- mActions[EvaluateSelection] = act = new QAction(
- QIcon::fromTheme("media-playback-start"), tr("&Evaluate Selection"), this);
- act->setShortcut(tr("Ctrl+Return", "Evaluate selection"));
- act->setStatusTip(tr("Evaluate selection or current line"));
- connect(act, SIGNAL(triggered()), this, SLOT(evaluateSelection()));
-
mActions[EvaluateRegion] = act = new QAction(
QIcon::fromTheme("media-playback-start"), tr("&Evaluate Region"), this);
- act->setShortcut(tr("Alt+Return", "Evaluate region"));
+ act->setShortcut(tr("Ctrl+Return", "Evaluate region"));
act->setStatusTip(tr("Evaluate current region"));
connect(act, SIGNAL(triggered()), this, SLOT(evaluateRegion()));
< at >< at > -303,7 +297,6 < at >< at > void MainWindow::createMenus()
menu->addSeparator();
menu->addAction( mActions[EvaluateCurrentFile] );
menu->addAction( mActions[EvaluateRegion] );
- menu->addAction( mActions[EvaluateSelection] );
menu->addSeparator();
menu->addAction( mMain->scProcess()->action(ScIDE::SCProcess::RunMain) );
menu->addAction( mMain->scProcess()->action(ScIDE::SCProcess::StopMain) );
< at >< at > -615,59 +608,49 < at >< at > QWidget *MainWindow::cmdLine()
return widget;
}
-void MainWindow::evaluateSelection()
+void MainWindow::evaluateRegion()
{
- // Evaluate selection, if any, otherwise current line
-
CodeEditor *editor = mEditors->currentEditor();
if (!editor)
return;
QString text;
+
+ // Try current selection
QTextCursor cursor = editor->textCursor();
if (cursor.hasSelection())
text = cursor.selectedText();
- else {
- text = cursor.block().text();
- if( mEditors->stepForwardEvaluation() ) {
- QTextCursor newCursor = cursor;
- newCursor.movePosition(QTextCursor::NextBlock);
- newCursor.movePosition(QTextCursor::EndOfBlock);
- editor->setTextCursor(newCursor);
+ else
+ {
+ // If no selection, try current region
+ cursor = editor->currentRegion();
+ if (!cursor.isNull())
+ text = cursor.selectedText();
+ else
+ {
+ //If no current region, try current line
+ cursor = editor->textCursor();
+ text = cursor.block().text();
+ if( mEditors->stepForwardEvaluation() ) {
+ QTextCursor newCursor = cursor;
+ newCursor.movePosition(QTextCursor::NextBlock);
+ newCursor.movePosition(QTextCursor::EndOfBlock);
+ editor->setTextCursor(newCursor);
+ }
+ // Adjust cursor for code blinking:
+ cursor.movePosition(QTextCursor::StartOfBlock);
+ cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
}
- // Adjust cursor for code blinking:
- cursor.movePosition(QTextCursor::StartOfBlock);
- cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
}
- if (text.isEmpty()) return;
-
- // NOTE: QTextDocument contains unicode paragraph separators U+2029
- text.replace( QChar( 0x2029 ), QChar( '\n' ) );
-
- Main::instance()->scProcess()->evaluateCode(text);
-
- editor->blinkCode(cursor);
-}
-
-void MainWindow::evaluateRegion()
-{
- CodeEditor *editor = mEditors->currentEditor();
- if (!editor)
- return;
-
- QTextCursor region = editor->currentRegion();
- if(region.isNull()) {
- // TODO: post a warning in status bar
+ if (text.isEmpty())
return;
- }
- QString text = region.selectedText();
text.replace( QChar( 0x2029 ), QChar( '\n' ) );
Main::instance()->scProcess()->evaluateCode(text);
- editor->blinkCode(region);
+ editor->blinkCode(cursor);
}
void MainWindow::evaluateCurrentFile()
diff --git a/editors/sc-ide/widgets/main_window.hpp b/editors/sc-ide/widgets/main_window.hpp
index c3a96aa..eca273f 100644
--- a/editors/sc-ide/widgets/main_window.hpp
+++ b/editors/sc-ide/widgets/main_window.hpp
< at >< at > -59,7 +59,6 < at >< at > public:
// Language
EvaluateCurrentFile,
- EvaluateSelection,
EvaluateRegion,
// Settings
< at >< at > -99,7 +98,6 < at >< at > signals:
void evaluateCode( const QString &, bool silent = true );
private Q_SLOTS:
- void evaluateSelection(); // either selection, or current line
void evaluateRegion();
void evaluateCurrentFile();
void helpForSelection();
-----------------------------------------------------------------------
Summary of changes:
editors/sc-ide/widgets/main_window.cpp | 69 ++++++++++++--------------------
editors/sc-ide/widgets/main_window.hpp | 2 -
2 files changed, 26 insertions(+), 45 deletions(-)
hooks/post-receive
</pre>
Jakob Leben
2012-05-24T16:49:09
-
SF.net Git: supercollider branch, master, updated. 0ba3c32734b98d58cf5569fc65e2627ea492ce17
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50909
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via 0ba3c32734b98d58cf5569fc65e2627ea492ce17 (commit)
via 50b92c4d83a1ddd49d3c8559a156dd8c0e7926c5 (commit)
from f65e9d8ce42498a94c4333ca7624efed4f1de502 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0ba3c32734b98d58cf5569fc65e2627ea492ce17
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Thu May 24 15:30:05 2012 +0200
sc ide: announce all actions to shortcut settings
diff --git a/editors/sc-ide/core/sc_process.cpp b/editors/sc-ide/core/sc_process.cpp
index 1d4f1ff..8baeaf9 100644
--- a/editors/sc-ide/core/sc_process.cpp
+++ b/editors/sc-ide/core/sc_process.cpp
< at >< at > -24,10 +24,10 < at >< at >
namespace ScIDE {
-SCProcess::SCProcess( QObject *parent ):
+SCProcess::SCProcess( Main *parent ):
QProcess( parent ), mIPC( new SCIpcServer(this) )
{
- prepareActions();
+ prepareActions(parent);
connect(this, SIGNAL( readyRead() ),
this, SLOT( onReadyRead() ));
< at >< at > -68,4 +68,33 < at >< at > void SCProcess::start (void)
onSclangStart();
}
+void SCProcess::prepareActions(Main * main)
+{
+ QAction * action;
+ mActions[StartSCLang] = action = new QAction(
+ QIcon::fromTheme("system-run"), tr("Start SCLang"), this);
+ connect(action, SIGNAL(triggered()), this, SLOT(start()) );
+
+ mActions[RecompileClassLibrary] = action = new QAction(
+ QIcon::fromTheme("system-reboot"), tr("Recompile Class Library"), this);
+ connect(action, SIGNAL(triggered()), this, SLOT(recompileClassLibrary()) );
+
+ mActions[StopSCLang] = action = new QAction(
+ QIcon::fromTheme("system-shutdown"), tr("Stop SCLang"), this);
+ connect(action, SIGNAL(triggered()), this, SLOT(stopLanguage()) );
+
+ mActions[RunMain] = action = new QAction(
+ QIcon::fromTheme("media-playback-start"), tr("Run Main"), this);
+ connect(action, SIGNAL(triggered()), this, SLOT(runMain()));
+
+ mActions[StopMain] = action = new QAction(
+ QIcon::fromTheme("process-stop"), tr("Stop Main"), this);
+ action->setShortcut(tr("Ctrl+.", "Stop Main (a.k.a. cmd-period)"));
+ connect(action, SIGNAL(triggered()), this, SLOT(stopMain()));
+
+ Settings::Manager *settings = main->settings();
+ for (int i = 0; i < SCProcessActionCount; ++i)
+ settings->addAction( mActions[i] );
+}
+
} // namespace ScIDE
diff --git a/editors/sc-ide/core/sc_process.hpp b/editors/sc-ide/core/sc_process.hpp
index f782546..f3bbe6c 100644
--- a/editors/sc-ide/core/sc_process.hpp
+++ b/editors/sc-ide/core/sc_process.hpp
< at >< at > -29,6 +29,8 < at >< at >
namespace ScIDE {
+class Main;
+
class SCProcess:
public QProcess
{
< at >< at > -36,7 +38,7 < at >< at > Q_OBJECT
SCIpcServer * mIPC;
public:
- SCProcess( QObject *parent = 0 );
+ SCProcess( Main * );
enum SCProcessActionRole {
StartSCLang = 0,
< at >< at > -132,29 +134,7 < at >< at > private:
evaluateCode ( command, true );
}
- void prepareActions(void)
- {
- QAction * action;
- mActions[StartSCLang] = action = new QAction(
- QIcon::fromTheme("system-run"), tr("Start SCLang"), this);
- connect(action, SIGNAL(triggered()), this, SLOT(start()) );
-
- mActions[RecompileClassLibrary] = action = new QAction(
- QIcon::fromTheme("system-reboot"), tr("Recompile Class Library"), this);
- connect(action, SIGNAL(triggered()), this, SLOT(recompileClassLibrary()) );
-
- mActions[StopSCLang] = action = new QAction(
- QIcon::fromTheme("system-shutdown"), tr("Stop SCLang"), this);
- connect(action, SIGNAL(triggered()), this, SLOT(stopLanguage()) );
-
- mActions[RunMain] = action = new QAction(
- QIcon::fromTheme("media-playback-start"), tr("Run Main"), this);
- connect(action, SIGNAL(triggered()), this, SLOT(runMain()));
-
- mActions[StopMain] = action = new QAction(
- QIcon::fromTheme("process-stop"), tr("Stop Main"), this);
- connect(action, SIGNAL(triggered()), this, SLOT(stopMain()));
- }
+ void prepareActions(Main *);
QAction * mActions[SCProcessActionCount];
};
diff --git a/editors/sc-ide/core/settings/manager.cpp b/editors/sc-ide/core/settings/manager.cpp
index 2880613..6dc91a5 100644
--- a/editors/sc-ide/core/settings/manager.cpp
+++ b/editors/sc-ide/core/settings/manager.cpp
< at >< at > -72,31 +72,6 < at >< at > void Manager::initDefaults()
endGroup(); // editor
- beginGroup("shortcuts");
- setDefault("cmdLineFocus", tr("Ctrl+Tab", "Toggle command line focus"));
- setDefault("quit", tr("Ctrl+Q", "Quit application"));
- setDefault("evaluateSelection", tr("Ctrl+Return", "Evaluate selection"));
- setDefault("evaluateRegion", tr("Alt+Return", "Evaluate region"));
- setDefault("stopMain", tr("Ctrl+.", "Stop Main (a.k.a. cmd-period)"));
- setDefault("helpForSelection", tr("Ctrl+H", "Help for selection"));
- setDefault("newDocument", tr("Ctrl+N", "New document"));
- setDefault("openDocument", tr("Ctrl+O", "Open document"));
- setDefault("saveDocument", tr("Ctrl+S", "Save document"));
- setDefault("reloadDocument", tr("F5", "Reload document"));
- setDefault("closeDocument", tr("Ctrl+W", "Close document"));
- setDefault("undo", tr("Ctrl+Z", "Undo"));
- setDefault("redo", tr("Ctrl+Shift+Z", "Redo"));
- setDefault("cut", tr("Ctrl+X", "Cut"));
- setDefault("copy", tr("Ctrl+C", "Copy"));
- setDefault("paste", tr("Ctrl+V", "Paste"));
- setDefault("find", tr("Ctrl+F", "Find"));
- setDefault("replace", tr("Ctrl+R", "Replace"));
- setDefault("hideToolPanel", tr("Esc", "Hide tool panel"));
- setDefault("enlargeFont", tr("Ctrl++", "Enlarge font"));
- setDefault("shrinkFont", tr("Ctrl+-", "Shrink font"));
- setDefault("openDefinition", tr("Ctrl+D", "Open definition"));
- endGroup(); // shortcuts
-
endGroup(); // IDE
}
diff --git a/editors/sc-ide/widgets/main_window.cpp b/editors/sc-ide/widgets/main_window.cpp
index 1030a0b..c86ea0a 100644
--- a/editors/sc-ide/widgets/main_window.cpp
+++ b/editors/sc-ide/widgets/main_window.cpp
< at >< at > -139,7 +139,7 < at >< at > void MainWindow::createMenus()
Settings::Manager *s = mMain->settings();
s->beginGroup("IDE/shortcuts");
- new QShortcut( s->shortcut("cmdLineFocus"), this, SLOT(toggleComandLineFocus()) );
+ new QShortcut( tr("Ctrl+Tab", "Toggle command line focus"), this, SLOT(toggleComandLineFocus()) );
QAction *act;
< at >< at > -147,25 +147,25 < at >< at > void MainWindow::createMenus()
mActions[Quit] = act = new QAction(
QIcon::fromTheme("application-exit"), tr("&Quit..."), this);
- act->setShortcut(s->shortcut("quit"));
+ act->setShortcut(tr("Ctrl+Q", "Quit application"));
act->setStatusTip(tr("Quit SuperCollider IDE"));
QObject::connect( act, SIGNAL(triggered()), this, SLOT(onQuit()) );
mActions[DocNew] = act = new QAction(
QIcon::fromTheme("document-new"), tr("&New"), this);
- act->setShortcut(s->shortcut("newDocument"));
+ act->setShortcut(tr("Ctrl+N", "New document"));
act->setStatusTip(tr("Create a new document"));
connect(act, SIGNAL(triggered()), this, SLOT(newDocument()));
mActions[DocOpen] = act = new QAction(
QIcon::fromTheme("document-open"), tr("&Open..."), this);
- act->setShortcut(s->shortcut("openDocument"));
+ act->setShortcut(tr("Ctrl+O", "Open document"));
act->setStatusTip(tr("Open an existing file"));
connect(act, SIGNAL(triggered()), this, SLOT(openDocument()));
mActions[DocSave] = act = new QAction(
QIcon::fromTheme("document-save"), tr("&Save"), this);
- act->setShortcut(s->shortcut("saveDocument"));
+ act->setShortcut(tr("Ctrl+S", "Save document"));
act->setStatusTip(tr("Save the current document"));
connect(act, SIGNAL(triggered()), this, SLOT(saveDocument()));
< at >< at > -176,13 +176,13 < at >< at > void MainWindow::createMenus()
mActions[DocClose] = act = new QAction(
QIcon::fromTheme("window-close"), tr("&Close"), this);
- act->setShortcut(s->shortcut("closeDocument"));
+ act->setShortcut(tr("Ctrl+W", "Close document"));
act->setStatusTip(tr("Close the current document"));
connect(act, SIGNAL(triggered()), this, SLOT(closeDocument()));
mActions[DocReload] = act = new QAction(
QIcon::fromTheme("view-refresh"), tr("&Reload"), this);
- act->setShortcut(s->shortcut("reloadDocument"));
+ act->setShortcut(tr("F5", "Reload document"));
act->setStatusTip(tr("Reload the current document"));
connect(act, SIGNAL(triggered()), this, SLOT(reloadDocument()));
< at >< at > -206,19 +206,16 < at >< at > void MainWindow::createMenus()
mActions[EvaluateSelection] = act = new QAction(
QIcon::fromTheme("media-playback-start"), tr("&Evaluate Selection"), this);
- act->setShortcut(s->shortcut("evaluateSelection"));
+ act->setShortcut(tr("Ctrl+Return", "Evaluate selection"));
act->setStatusTip(tr("Evaluate selection or current line"));
connect(act, SIGNAL(triggered()), this, SLOT(evaluateSelection()));
mActions[EvaluateRegion] = act = new QAction(
QIcon::fromTheme("media-playback-start"), tr("&Evaluate Region"), this);
- act->setShortcut(s->shortcut("evaluateRegion"));
+ act->setShortcut(tr("Alt+Return", "Evaluate region"));
act->setStatusTip(tr("Evaluate current region"));
connect(act, SIGNAL(triggered()), this, SLOT(evaluateRegion()));
- mMain->scProcess()->action(ScIDE::SCProcess::StopMain)
- ->setShortcut(s->shortcut("stopMain"));
-
// Settings
mActions[ShowSettings] = act = new QAction(tr("&Configure IDE..."), this);
< at >< at > -243,7 +240,7 < at >< at > void MainWindow::createMenus()
mActions[HelpForSelection] = act = new QAction(
QIcon::fromTheme("system-help"), tr("&Help for Selection"), this);
- act->setShortcut(s->shortcut("helpForSelection"));
+ act->setShortcut(tr("Ctrl+H", "Help for selection"));
act->setStatusTip(tr("Find help for selected text"));
connect(act, SIGNAL(triggered()), this, SLOT(helpForSelection()));
< at >< at > -324,6 +321,10 < at >< at > void MainWindow::createMenus()
menu->addAction( mActions[HelpForSelection] );
menuBar()->addMenu(menu);
+
+ // Add actions to settings
+ for (int i = 0; i < ActionCount; ++i)
+ s->addAction( mActions[i] );
}
QAction *MainWindow::action( ActionRole role )
diff --git a/editors/sc-ide/widgets/multi_editor.cpp b/editors/sc-ide/widgets/multi_editor.cpp
index 4dabb65..7164a6c 100644
--- a/editors/sc-ide/widgets/multi_editor.cpp
+++ b/editors/sc-ide/widgets/multi_editor.cpp
< at >< at > -92,52 +92,52 < at >< at > void MultiEditor::createActions()
mActions[Undo] = act = new QAction(
QIcon::fromTheme("edit-undo"), tr("&Undo"), this);
- act->setShortcut(s->shortcut("undo"));
+ act->setShortcut(tr("Ctrl+Z", "Undo"));
act->setStatusTip(tr("Undo last editing action"));
mSigMux->connect(act, SIGNAL(triggered()), SLOT(undo()));
mSigMux->connect(SIGNAL(undoAvailable(bool)), act, SLOT(setEnabled(bool)));
mActions[Redo] = act = new QAction(
QIcon::fromTheme("edit-redo"), tr("Re&do"), this);
- act->setShortcut(s->shortcut("redo"));
+ act->setShortcut(tr("Ctrl+Shift+Z", "Redo"));
act->setStatusTip(tr("Redo next editing action"));
mSigMux->connect(act, SIGNAL(triggered()), SLOT(redo()));
mSigMux->connect(SIGNAL(redoAvailable(bool)), act, SLOT(setEnabled(bool)));
mActions[Cut] = act = new QAction(
QIcon::fromTheme("edit-cut"), tr("Cu&t"), this);
- act->setShortcut(s->shortcut("cut"));
+ act->setShortcut(tr("Ctrl+X", "Cut"));
act->setStatusTip(tr("Cut text to clipboard"));
mSigMux->connect(act, SIGNAL(triggered()), SLOT(cut()));
mSigMux->connect(SIGNAL(copyAvailable(bool)), act, SLOT(setEnabled(bool)));
mActions[Copy] = act = new QAction(
QIcon::fromTheme("edit-copy"), tr("&Copy"), this);
- act->setShortcut(s->shortcut("copy"));
+ act->setShortcut(tr("Ctrl+C", "Copy"));
act->setStatusTip(tr("Copy text to clipboard"));
mSigMux->connect(act, SIGNAL(triggered()), SLOT(copy()));
mSigMux->connect(SIGNAL(copyAvailable(bool)), act, SLOT(setEnabled(bool)));
mActions[Paste] = act = new QAction(
QIcon::fromTheme("edit-paste"), tr("&Paste"), this);
- act->setShortcut(s->shortcut("paste"));
+ act->setShortcut(tr("Ctrl+V", "Paste"));
act->setStatusTip(tr("Paste text from clipboard"));
mSigMux->connect(act, SIGNAL(triggered()), SLOT(paste()));
mActions[Find] = act = new QAction(
QIcon::fromTheme("edit-find"), tr("&Find..."), this);
- act->setShortcut(s->shortcut("find"));
+ act->setShortcut(tr("Ctrl+F", "Find"));
act->setStatusTip(tr("Find text in document"));
connect(act, SIGNAL(triggered()), this, SLOT(showFindPanel()));
mActions[Replace] = act = new QAction(
QIcon::fromTheme("edit-replace"), tr("&Replace..."), this);
- act->setShortcut(s->shortcut("replace"));
+ act->setShortcut(tr("Ctrl+R", "Replace"));
act->setStatusTip(tr("Find and replace text in document"));
connect(act, SIGNAL(triggered()), this, SLOT(showReplacePanel()));
QShortcut *escShortcut =
- new QShortcut( s->shortcut("hideToolPanel"), this, SLOT(hideToolPanel()) );
+ new QShortcut( tr("Esc", "Hide tool panel"), this, SLOT(hideToolPanel()) );
mSigMux->connect(escShortcut, SIGNAL(activated()), SLOT(clearSearchHighlighting()));
mActions[IndentMore] = act = new QAction(
< at >< at > -154,13 +154,13 < at >< at > void MultiEditor::createActions()
mActions[EnlargeFont] = act = new QAction(
QIcon::fromTheme("zoom-in"), tr("&Enlarge Font"), this);
- act->setShortcut(s->shortcut("enlargeFont"));
+ act->setShortcut(tr("Ctrl++", "Enlarge font"));
act->setStatusTip(tr("Increase displayed font size"));
mSigMux->connect(act, SIGNAL(triggered()), SLOT(zoomIn()));
mActions[ShrinkFont] = act = new QAction(
QIcon::fromTheme("zoom-out"), tr("&Shrink Font"), this);
- act->setShortcut(s->shortcut("shrinkFont"));
+ act->setShortcut( tr("Ctrl+-", "Shrink font"));
act->setStatusTip(tr("Decrease displayed font size"));
mSigMux->connect(act, SIGNAL(triggered()), SLOT(zoomOut()));
< at >< at > -170,10 +170,13 < at >< at > void MultiEditor::createActions()
// Browse
mActions[OpenClassDefinition] = act = new QAction(tr("Open Class Definition"), this);
- act->setShortcut(s->shortcut("openDefinition"));
+ act->setShortcut(tr("Ctrl+D", "Open definition"));
connect(act, SIGNAL(triggered(bool)), this, SLOT(openClassDefinition()));
s->endGroup(); // IDE/shortcuts
+
+ for (int i = 0; i < ActionRoleCount; ++i)
+ s->addAction( mActions[i] );
}
void MultiEditor::updateActions()
commit 50b92c4d83a1ddd49d3c8559a156dd8c0e7926c5
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Thu May 24 15:27:54 2012 +0200
sc ide: implement shortcut settings GUI
diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
index 26e15fd..0ab61ef 100644
--- a/editors/sc-ide/CMakeLists.txt
+++ b/editors/sc-ide/CMakeLists.txt
< at >< at > -23,8 +23,10 < at >< at > set ( ide_moc_hdr
widgets/settings/dialog.hpp
widgets/settings/sclang_page.hpp
widgets/settings/editor_page.hpp
+ widgets/settings/shortcuts_page.hpp
widgets/util/path_chooser_widget.hpp
widgets/util/text_format_list_widget.hpp
+ widgets/util/key_sequence_edit.hpp
)
set ( ide_src
< at >< at > -47,6 +49,7 < at >< at > set ( ide_src
widgets/settings/dialog.cpp
widgets/settings/sclang_page.cpp
widgets/settings/editor_page.cpp
+ widgets/settings/shortcuts_page.cpp
widgets/util/text_format_list_widget.cpp
)
< at >< at > -54,6 +57,7 < at >< at > set( ide_forms
forms/settings_dialog.ui
forms/settings_sclang.ui
forms/settings_editor.ui
+ forms/settings_shortcuts.ui
)
# Translation files
diff --git a/editors/sc-ide/core/settings/manager.cpp b/editors/sc-ide/core/settings/manager.cpp
index 4168776..2880613 100644
--- a/editors/sc-ide/core/settings/manager.cpp
+++ b/editors/sc-ide/core/settings/manager.cpp
< at >< at > -154,4 +154,22 < at >< at > QKeySequence Manager::shortcut( const QString & key )
return QKeySequence( value(key).toString() );
}
+void Manager::addAction ( QAction *action )
+{
+ mActions.append(action);
+ QString key = keyForAction(action);
+
+ beginGroup("IDE/shortcuts");
+
+ setDefault( key, QVariant::fromValue<QKeySequence>(action->shortcut()) );
+ action->setShortcut( value(key).value<QKeySequence>() );
+
+ endGroup();
+}
+
+QString Manager::keyForAction ( QAction *action )
+{
+ return action->text().toLower().remove('&').replace(' ', '_');
+}
+
}} // namespace ScIDE::Settings
diff --git a/editors/sc-ide/core/settings/manager.hpp b/editors/sc-ide/core/settings/manager.hpp
index fd90163..dd4e1f4 100644
--- a/editors/sc-ide/core/settings/manager.hpp
+++ b/editors/sc-ide/core/settings/manager.hpp
< at >< at > -25,6 +25,8 < at >< at >
#include <QObject>
#include <QKeySequence>
+#include <QList>
+#include <QAction>
namespace ScIDE { namespace Settings {
< at >< at > -51,10 +53,17 < at >< at > public:
void sync() { mSettings->sync(); }
+ void remove ( const QString &key ) { mSettings->remove(key); }
+
// extended
bool contains ( const QString & key ) const;
+ bool isOverridden( const QString & key ) const
+ {
+ return mSettings->contains( key );
+ }
+
QVariant value ( const QString & key ) const;
QVariant defaultValue ( const QString & key ) const
< at >< at > -66,6 +75,10 < at >< at > public:
QKeySequence shortcut( const QString & key );
+ const QList<QAction*> & actions() { return mActions; }
+ void addAction ( QAction *action );
+ QString keyForAction ( QAction *action );
+
private:
void setDefault ( const QString & key, const QVariant & value )
{
< at >< at > -87,6 +100,7 < at >< at > private:
QSettings *mSettings;
SettingsMap mDefaults;
+ QList<QAction*> mActions;
};
}} // namespace ScIDE::Settings
diff --git a/editors/sc-ide/forms/settings_shortcuts.ui b/editors/sc-ide/forms/settings_shortcuts.ui
new file mode 100644
index 0000000..f807ec0
--- /dev/null
+++ b/editors/sc-ide/forms/settings_shortcuts.ui
< at >< at > -0,0 +1,109 < at >< at >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ShortcutConfigPage</class>
+ <widget class="QWidget" name="ShortcutConfigPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>507</width>
+ <height>378</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Filter:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="filter"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTreeWidget" name="actionTree">
+ <column>
+ <property name="text">
+ <string>Action</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Shortcut</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Description</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="labelAlignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="defaultOpt">
+ <property name="text">
+ <string>Default:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="defaultSeq"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QRadioButton" name="customOpt">
+ <property name="text">
+ <string>Custom:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="ScIDE::KeySequenceEdit" name="customSeq">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="clearSeq">
+ <property name="text">
+ <string>Clear</string>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonIconOnly</enum>
+ </property>
+ <property name="autoRaise">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>ScIDE::KeySequenceEdit</class>
+ <extends>QLineEdit</extends>
+ <header>key_sequence_edit.hpp</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/editors/sc-ide/widgets/settings/dialog.cpp b/editors/sc-ide/widgets/settings/dialog.cpp
index ccd3d2a..cabfb7a 100644
--- a/editors/sc-ide/widgets/settings/dialog.cpp
+++ b/editors/sc-ide/widgets/settings/dialog.cpp
< at >< at > -22,6 +22,7 < at >< at >
#include "ui_settings_dialog.h"
#include "sclang_page.hpp"
#include "editor_page.hpp"
+#include "shortcuts_page.hpp"
#include "../../core/settings/manager.hpp"
#include <QVBoxLayout>
< at >< at > -56,6 +57,13 < at >< at > Dialog::Dialog( Manager *settings, QWidget * parent ):
connect(this, SIGNAL(storeRequest(Manager*)), w, SLOT(store(Manager*)));
connect(this, SIGNAL(loadRequest(Manager*)), w, SLOT(load(Manager*)));
+ w = new ShortcutsPage;
+ ui->configPageStack->addWidget(w);
+ ui->configPageList->addItem (
+ new QListWidgetItem(QIcon::fromTheme("input-keyboard"), "Shortcuts"));
+ connect(this, SIGNAL(storeRequest(Manager*)), w, SLOT(store(Manager*)));
+ connect(this, SIGNAL(loadRequest(Manager*)), w, SLOT(load(Manager*)));
+
connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked()),
diff --git a/editors/sc-ide/widgets/settings/shortcuts_page.cpp b/editors/sc-ide/widgets/settings/shortcuts_page.cpp
new file mode 100644
index 0000000..73d721f
--- /dev/null
+++ b/editors/sc-ide/widgets/settings/shortcuts_page.cpp
< at >< at > -0,0 +1,200 < at >< at >
+/*
+ SuperCollider Qt IDE
+ Copyright (c) 2012 Jakob Leben & Tim Blechmann
+ http://www.audiosynth.com
+
+ This program 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.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "shortcuts_page.hpp"
+#include "ui_settings_shortcuts.h"
+#include "../../core/settings/manager.hpp"
+#include "../../core/main.hpp"
+
+#include <QHeaderView>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QKeyEvent>
+
+Q_DECLARE_METATYPE(QAction*);
+Q_DECLARE_METATYPE(QKeySequence);
+
+namespace ScIDE { namespace Settings {
+
+ShortcutsPage::ShortcutsPage(QWidget *parent) :
+ QWidget(parent),
+ ui( new Ui::ShortcutConfigPage )
+{
+ ui->setupUi(this);
+
+ ui->clearSeq->setIcon( style()->standardIcon(QStyle::SP_DockWidgetCloseButton) );
+
+ connect(ui->filter, SIGNAL(textChanged(QString)), this, SLOT(filterBy(QString)));
+ connect(ui->actionTree, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
+ this, SLOT(showItem(QTreeWidgetItem*,QTreeWidgetItem*)));
+
+ // automation
+ connect(ui->defaultOpt, SIGNAL(clicked()), ui->customSeq, SLOT(reset()));
+ connect(ui->customOpt, SIGNAL(clicked()), ui->customSeq, SLOT(setFocus()));
+ connect(ui->customSeq, SIGNAL(editingStarted()), ui->customOpt, SLOT(toggle()));
+ connect(ui->clearSeq, SIGNAL(clicked()), ui->customSeq, SLOT(reset()));
+ connect(ui->clearSeq, SIGNAL(clicked()), ui->customOpt, SLOT(click()));
+
+ // value application
+ connect(ui->defaultOpt, SIGNAL(clicked()), this, SLOT(apply()));
+ connect(ui->customOpt, SIGNAL(clicked()), this, SLOT(apply()));
+ connect(ui->customSeq, SIGNAL(editingFinished()), this, SLOT(apply()));
+}
+
+ShortcutsPage::~ShortcutsPage()
+{
+ delete ui;
+}
+
+void ShortcutsPage::load( Manager *s )
+{
+ ui->actionTree->clear();
+
+ s->beginGroup("IDE/shortcuts");
+
+ const QList<QAction*> & actions = s->actions();
+ foreach (QAction *action, actions)
+ addAction(action, s);
+
+ s->endGroup();
+
+ ui->actionTree->sortByColumn(0, Qt::AscendingOrder);
+ ui->actionTree->header()->resizeSections(QHeaderView::ResizeToContents);
+}
+
+void ShortcutsPage::store( Manager *s )
+{
+ s->beginGroup("IDE/shortcuts");
+
+ s->remove("");
+
+ int c = ui->actionTree->topLevelItemCount();
+ for (int i = 0; i < c; ++i)
+ {
+ QTreeWidgetItem *item = ui->actionTree->topLevelItem(i);
+ QAction *action = item->data(0, ActionRole).value<QAction*>();
+ Q_ASSERT(action);
+
+ QVariant var = item->data(0, CustomSequenceRole);
+ if (var.isValid()) {
+ s->setValue( s->keyForAction(action), var );
+ }
+ else {
+ var = s->defaultValue( s->keyForAction(action) );
+ }
+ action->setShortcut( var.value<QKeySequence>() );
+ }
+
+ s->endGroup();
+}
+
+void ShortcutsPage::addAction( QAction *a, Manager *s )
+{
+ QTreeWidgetItem *item = new QTreeWidgetItem;
+ item->setIcon(0, a->icon());
+ item->setText(0, a->text().remove('&'));
+ item->setText(2, a->statusTip() );
+
+ QString key = s->keyForAction(a);
+
+ item->setData(0, ActionRole, QVariant::fromValue<QAction*>(a));
+
+ item->setData(0, DefaultSequenceRole, s->defaultValue(key));
+
+ if (s->isOverridden(key)) {
+ // For reason of performance, ensure the variant holds a QKeySequence
+ QKeySequence seq = s->value(key).value<QKeySequence>();
+ item->setData(0, CustomSequenceRole, QVariant::fromValue<QKeySequence>(seq) );
+ }
+
+ updateItem(item);
+
+ ui->actionTree->addTopLevelItem(item);
+}
+
+void ShortcutsPage::filterBy( const QString &str )
+{
+ int c = ui->actionTree->topLevelItemCount();
+ if (str.isEmpty())
+ {
+ for (int i = 0; i < c; ++i)
+ ui->actionTree->topLevelItem(i)->setHidden(false);
+ }
+ else
+ {
+ for (int i = 0; i < c; ++i)
+ {
+ QTreeWidgetItem *item = ui->actionTree->topLevelItem(i);
+ bool visible =
+ item->text(0).contains(str, Qt::CaseInsensitive)
+ || item->text(2).contains(str, Qt::CaseInsensitive);
+ item->setHidden(!visible);
+ }
+ }
+}
+
+void ShortcutsPage::showItem( QTreeWidgetItem *item, QTreeWidgetItem *prev )
+{
+ QAction *a = item->data(0, ActionRole).value<QAction*>();
+ Q_ASSERT(a);
+
+ QString defaultSeq = item->data(0, DefaultSequenceRole).toString();
+ ui->defaultSeq->setText( defaultSeq );
+
+ QVariant customSeqVar = item->data(0, CustomSequenceRole);
+ ui->customSeq->setSequence( customSeqVar.value<QKeySequence>() );
+
+ if (customSeqVar.isValid())
+ ui->customOpt->setChecked(true);
+ else
+ ui->defaultOpt->setChecked(true);
+}
+
+void ShortcutsPage::apply()
+{
+ applyTo( ui->actionTree->currentItem() );
+}
+
+void ShortcutsPage::applyTo( QTreeWidgetItem *item )
+{
+ if (!item) return;
+
+ if (ui->customOpt->isChecked()) {
+ QKeySequence seq = ui->customSeq->sequence();
+ item->setData(0, CustomSequenceRole, QVariant::fromValue<QKeySequence>(seq));
+ }
+ else {
+ item->setData(0, CustomSequenceRole, QVariant());
+ }
+ updateItem(item);
+}
+
+void ShortcutsPage::updateItem( QTreeWidgetItem *item )
+{
+ QVariant seqData = item->data(0, CustomSequenceRole);
+ if (!seqData.isValid())
+ seqData = item->data(0, DefaultSequenceRole);
+
+ QKeySequence seq = seqData.value<QKeySequence>();
+
+ item->setText(1, seq.toString(QKeySequence::NativeText));
+}
+
+}} // namespace ScIDE::Settings
diff --git a/editors/sc-ide/widgets/settings/shortcuts_page.hpp b/editors/sc-ide/widgets/settings/shortcuts_page.hpp
new file mode 100644
index 0000000..b84d652
--- /dev/null
+++ b/editors/sc-ide/widgets/settings/shortcuts_page.hpp
< at >< at > -0,0 +1,76 < at >< at >
+/*
+ SuperCollider Qt IDE
+ Copyright (c) 2012 Jakob Leben & Tim Blechmann
+ http://www.audiosynth.com
+
+ This program 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.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef SCIDE_WIDGETS_SETTINGS_SHORTCUTS_PAGE_HPP_INCLUDED
+#define SCIDE_WIDGETS_SETTINGS_SHORTCUTS_PAGE_HPP_INCLUDED
+
+#include <QWidget>
+#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
+
+class QTreeWidgetItem;
+
+namespace Ui {
+ class ShortcutConfigPage;
+}
+
+namespace ScIDE { namespace Settings {
+
+class Manager;
+
+class ShortcutsPage : public QWidget
+{
+ Q_OBJECT
+
+public:
+ ShortcutsPage(QWidget *parent = 0);
+ ~ShortcutsPage();
+
+public Q_SLOTS:
+ void load( Manager * );
+ void store( Manager * );
+ void filterBy( const QString & );
+
+private Q_SLOTS:
+ void showItem( QTreeWidgetItem *, QTreeWidgetItem * );
+ void apply();
+
+private:
+ enum ItemDataRole
+ {
+ ActionRole = Qt::UserRole,
+ SettingsKeyRole,
+ DefaultSequenceRole,
+ CustomSequenceRole,
+ EditedRole
+ };
+
+ void addAction( QAction *, Manager * );
+ void applyTo( QTreeWidgetItem * );
+ void updateItem( QTreeWidgetItem * );
+
+ Ui::ShortcutConfigPage *ui;
+ QStandardItemModel *mActionModel;
+ QSortFilterProxyModel *mFilter;
+};
+
+}} // namespace ScIDE::Settings
+
+#endif // SCIDE_WIDGETS_SETTINGS_SHORTCUTS_PAGE_HPP_INCLUDED
diff --git a/editors/sc-ide/widgets/util/key_sequence_edit.hpp b/editors/sc-ide/widgets/util/key_sequence_edit.hpp
new file mode 100644
index 0000000..7200212
--- /dev/null
+++ b/editors/sc-ide/widgets/util/key_sequence_edit.hpp
< at >< at > -0,0 +1,180 < at >< at >
+/*
+ SuperCollider Qt IDE
+ Copyright (c) 2012 Jakob Leben & Tim Blechmann
+ http://www.audiosynth.com
+
+ This program 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.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef SCIDE_WIDGETS_KEY_SEQUENCE_EDIT_HPP_INCLUDED
+#define SCIDE_WIDGETS_KEY_SEQUENCE_EDIT_HPP_INCLUDED
+
+#include <QLineEdit>
+#include <QKeyEvent>
+#include <QBasicTimer>
+
+namespace ScIDE {
+
+class KeySequenceEdit : public QLineEdit
+{
+ Q_OBJECT
+
+private:
+ QBasicTimer mEditingTimer;
+
+public:
+ KeySequenceEdit( QWidget *parent = 0 ):
+ QLineEdit(parent),
+ k1(0), k2(0), k3(0), k4(0),
+ mEditing(false)
+ {
+ setReadOnly(true);
+ }
+
+ QKeySequence sequence()
+ {
+ return QKeySequence(k1, k2, k3, k4);
+ }
+
+ void setSequence( const QKeySequence &seq )
+ {
+ k1 = seq[0];
+ k2 = seq[1];
+ k3 = seq[2];
+ k4 = seq[3];
+
+ if (mEditing)
+ finishEditing();
+ else
+ updateText();
+ }
+
+public slots:
+ void reset()
+ {
+ k1 = k2 = k3 = k4 = 0;
+
+ if (mEditing)
+ finishEditing();
+ else
+ updateText();
+ }
+
+ void finishEditing()
+ {
+ if (mEditing) {
+ mEditing = false;
+ mEditingTimer.stop();
+ updateText();
+ emit editingFinished();
+ }
+ }
+
+signals:
+ void editingStarted();
+
+protected:
+//#if 0
+ void updateText()
+ {
+ QKeySequence seq = sequence();
+ if (seq.isEmpty())
+ clear();
+ else {
+ QString text = sequence().toString(QKeySequence::NativeText);
+ if (mEditing) text.append(", ...");
+ setText( text );
+ }
+ }
+
+ bool event( QEvent *e )
+ {
+ if (e->type() != QEvent::KeyPress)
+ return QLineEdit::event(e);
+
+ e->accept();
+
+ QKeyEvent *ke = static_cast<QKeyEvent*>(e);
+ int key = ke->key();
+
+ if (isModifier(key))
+ return true;
+
+ int *k;
+ if (!mEditing) {
+ k1 = k2 = k3 = k4 = 0;
+ mEditing = true;
+ k = &k1;
+ }
+ else {
+ if(k1 == 0)
+ k = &k1;
+ else if(k2 == 0)
+ k = &k2;
+ else if(k3 == 0)
+ k = &k3;
+ else
+ k = &k4;
+ }
+
+ *k = key | ke->modifiers();
+
+ if (k == &k4)
+ finishEditing();
+ else {
+ mEditingTimer.start(800, this);
+ updateText();
+ if (k == &k1)
+ emit editingStarted();
+ }
+
+ return true;
+ }
+
+ virtual void timerEvent ( QTimerEvent * e )
+ {
+ if (e->timerId() == mEditingTimer.timerId())
+ finishEditing();
+ }
+
+ void focusOutEvent( QFocusEvent * e )
+ {
+ finishEditing();
+ }
+
+//#endif
+private:
+ bool isModifier(int key)
+ {
+ switch (key)
+ {
+ case Qt::Key_Shift:
+ case Qt::Key_Control:
+ case Qt::Key_Meta:
+ case Qt::Key_Alt:
+ case Qt::Key_AltGr:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ int k1, k2, k3, k4;
+ bool mEditing;
+};
+
+} // namespace ScIDE
+
+#endif // SCIDE_WIDGETS_KEY_SEQUENCE_EDIT_HPP_INCLUDED
-----------------------------------------------------------------------
Summary of changes:
editors/sc-ide/CMakeLists.txt | 4 +
editors/sc-ide/core/sc_process.cpp | 33 +++-
editors/sc-ide/core/sc_process.hpp | 28 +---
editors/sc-ide/core/settings/manager.cpp | 43 ++---
editors/sc-ide/core/settings/manager.hpp | 14 ++
editors/sc-ide/forms/settings_shortcuts.ui | 109 +++++++++++
editors/sc-ide/widgets/main_window.cpp | 27 ++--
editors/sc-ide/widgets/multi_editor.cpp | 25 ++-
editors/sc-ide/widgets/settings/dialog.cpp | 8 +
editors/sc-ide/widgets/settings/shortcuts_page.cpp | 200 ++++++++++++++++++++
.../{editor_page.hpp => shortcuts_page.hpp} | 49 +++--
editors/sc-ide/widgets/util/key_sequence_edit.hpp | 180 ++++++++++++++++++
12 files changed, 625 insertions(+), 95 deletions(-)
create mode 100644 editors/sc-ide/forms/settings_shortcuts.ui
create mode 100644 editors/sc-ide/widgets/settings/shortcuts_page.cpp
copy editors/sc-ide/widgets/settings/{editor_page.hpp => shortcuts_page.hpp} (54%)
create mode 100644 editors/sc-ide/widgets/util/key_sequence_edit.hpp
hooks/post-receive
</pre>
Jakob Leben
2012-05-24T16:24:53
-
sc3-plugins DL outdated
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50907
<pre>hola,
I noticed that the sc3plugins "latest version" downloads are very
outdated on sf.net.
both [1] and [2] main downloads link to a src from 2010-09-03...
maybe that could be updated a bit?
just saying...
[1] http://sc3-plugins.sf.net
[2] http://sf.net/projects/sc3-plugins
y
</pre>
yvan volochine
2012-05-24T10:11:28
-
HID on OSX
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50901
<pre>Hiho,
the attempts to fix HID on OSX are stagnating again.
A while ago (right after the symposium), I posted a workaround to deal with
the 64bit long locID; Miguel improved the patch, so basically the work that
Josh started could be continued from there.
Is there anyone who wants to pick this up? and has time?
This bug is really a showstopper for a lot of people!
Until this is fixed, we will have a large user base who will not move on to
3.5 (or 3.6...).
sincerely,
Marije
_______________________________________________
sc-dev mailing list
info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/
</pre>
nescivi
2012-05-23T11:55:47
-
SF.net Git: supercollider branch, 3.5, updated. c3471187db047e02880f8a3fa7ae85479953967e
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50898
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, 3.5 has been updated
via c3471187db047e02880f8a3fa7ae85479953967e (commit)
from e3bbcb0b6d4ab0fff0a32fa27bec1050d8f8c85c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c3471187db047e02880f8a3fa7ae85479953967e
Author: Tim Blechmann <tim-xpEK/MU0Hawdnm+yROfE0A< at >public.gmane.org>
Date: Tue May 22 17:08:40 2012 +0200
external libraries: update nova-tt (gcc 4.7 fix)
Signed-off-by: Tim Blechmann <tim-xpEK/MU0Hawdnm+yROfE0A< at >public.gmane.org>
diff --git a/external_libraries/nova-tt b/external_libraries/nova-tt
index 871c09e..377f79a 160000
--- a/external_libraries/nova-tt
+++ b/external_libraries/nova-tt
< at >< at > -1 +1 < at >< at >
-Subproject commit 871c09e261986726e193a0213193f01695b0f0ca
+Subproject commit 377f79ac6326704c334ae87081969d71e8b94b2f
-----------------------------------------------------------------------
Summary of changes:
external_libraries/nova-tt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
</pre>
Tim Blechmann
2012-05-22T15:18:14
-
SF.net Git: supercollider branch, master, updated. f65e9d8ce42498a94c4333ca7624efed4f1de502
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50897
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via f65e9d8ce42498a94c4333ca7624efed4f1de502 (commit)
via 461fcef475470738747725bbcb12c62f5f9ed02c (commit)
from 500d3d523f5208e8aa4a39d13e7fd128aa79e18f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f65e9d8ce42498a94c4333ca7624efed4f1de502
Author: Tim Blechmann <tim-xpEK/MU0Hawdnm+yROfE0A< at >public.gmane.org>
Date: Tue May 22 17:08:40 2012 +0200
external libraries: update nova-tt (gcc 4.7 fix)
Signed-off-by: Tim Blechmann <tim-xpEK/MU0Hawdnm+yROfE0A< at >public.gmane.org>
diff --git a/external_libraries/nova-tt b/external_libraries/nova-tt
index 871c09e..377f79a 160000
--- a/external_libraries/nova-tt
+++ b/external_libraries/nova-tt
< at >< at > -1 +1 < at >< at >
-Subproject commit 871c09e261986726e193a0213193f01695b0f0ca
+Subproject commit 377f79ac6326704c334ae87081969d71e8b94b2f
commit 461fcef475470738747725bbcb12c62f5f9ed02c
Author: Tim Blechmann <tim-xpEK/MU0Hawdnm+yROfE0A< at >public.gmane.org>
Date: Fri May 18 12:24:04 2012 +0200
cmake build system: locate server plugins on freebsd
Signed-off-by: Tim Blechmann <tim-xpEK/MU0Hawdnm+yROfE0A< at >public.gmane.org>
diff --git a/server/scsynth/CMakeLists.txt b/server/scsynth/CMakeLists.txt
index 25a8f4f..1c93824 100644
--- a/server/scsynth/CMakeLists.txt
+++ b/server/scsynth/CMakeLists.txt
< at >< at > -165,7 +165,7 < at >< at > elseif(NOT NO_LIBSNDFILE)
message(SEND_ERROR "Cannot find libsndfile")
endif(SNDFILE_FOUND)
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
add_definitions(-DSC_PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/lib/SuperCollider/plugins")
endif()
-----------------------------------------------------------------------
Summary of changes:
external_libraries/nova-tt | 2 +-
server/scsynth/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
</pre>
Tim Blechmann
2012-05-22T15:17:01
-
SF.net Git: supercollider branch, master, updated. 500d3d523f5208e8aa4a39d13e7fd128aa79e18f
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50881
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via 500d3d523f5208e8aa4a39d13e7fd128aa79e18f (commit)
via 5ca3c77b5901b53d698b7c3146e33be281f0993a (commit)
via f158be344527570cea05e6f81112d1fc6843bfbe (commit)
via 7dadbe26221452728a847b463d0f8005700f3758 (commit)
from 3f34cdf356aa3c4150714f846d92574bf6d7f717 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 500d3d523f5208e8aa4a39d13e7fd128aa79e18f
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Fri May 4 22:37:19 2012 +0200
qtcollider: only hide windows on language shutdown (do not destroy them)
diff --git a/QtCollider/LanguageClient.cpp b/QtCollider/LanguageClient.cpp
index f701435..93cfa2a 100644
--- a/QtCollider/LanguageClient.cpp
+++ b/QtCollider/LanguageClient.cpp
< at >< at > -28,6 +28,7 < at >< at >
#include <PyrLexer.h>
#include <qmath.h>
+#include <QWidget>
extern double elapsedTime();
< at >< at > -118,40 +119,9 < at >< at > void LangClient::onQuit( int exitCode )
void LangClient::onLibraryShutdown()
{
- // NOTE: Finalization does not work properly in sclang:
- // finalizers of still accessible objects are not called at shutdown.
- // Therefore we finalize here manually.
-
- QtCollider::lockLang();
- if(!compiledOK) {
- QtCollider::unlockLang();
- return;
- }
-
- VMGlobals *g = gMainVMGlobals;
-
- // Get the 'heap' classvar of QObject:
- int idx = slotRawInt( &SC_CLASS(QObject)->classVarIndex );
- PyrSlot *heap_slot = slotRawObject( &g->process->classVars )->slots + idx;
-
- if (IsObj(heap_slot))
- {
- // Delete all objects on heap:
- PyrObject *heap = slotRawObject( heap_slot );
- int n = heap->size;
- for(int i = 0; i < n; ++i)
- {
- PyrObject *object = slotRawObject(heap->slots+i);
- QObjectProxy *proxy = static_cast<QObjectProxy*>(slotRawPtr(object->slots));
- proxy->finalize();
- proxy->destroy( QObjectProxy::DestroyObject );
- // Destroy the proxy later, to keep it safe for other shutdown handlers:
- DestroyEvent *e = new DestroyEvent( QObjectProxy::DestroyProxy );
- QApplication::postEvent( proxy, e );
- }
- }
-
- QtCollider::unlockLang();
+ QWidgetList windows = QApplication::topLevelWidgets();
+ Q_FOREACH( QWidget *w, windows )
+ w->hide();
}
void LangClient::customEvent( QEvent *e )
commit 5ca3c77b5901b53d698b7c3146e33be281f0993a
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Mon May 21 19:28:37 2012 +0200
qtcollider: remove an unneeded primitive
diff --git a/QtCollider/primitives/prim_QObject.cpp b/QtCollider/primitives/prim_QObject.cpp
index faf7789..223bf89 100644
--- a/QtCollider/primitives/prim_QObject.cpp
+++ b/QtCollider/primitives/prim_QObject.cpp
< at >< at > -126,17 +126,6 < at >< at > int QObject_Finalize( struct VMGlobals *, struct PyrObject *obj )
return errNone;
}
-QC_LANG_PRIMITIVE( QObject_ManuallyFinalize, 0, PyrSlot *r, PyrSlot *a, VMGlobals *g )
-{
- qcSCObjectDebugMsg( 1, slotRawObject(r), "MANUAL FINALIZE" );
-
- // WARNING we assume that proxy's deletion will be deferred until any
- // language shutdown code using it will have been executed, so any
- // shutdown code is safe.
-
- return QObject_Finalize( g, slotRawObject(r) );
-}
-
QC_LANG_PRIMITIVE( QObject_SetParent, 1, PyrSlot *r, PyrSlot *a, VMGlobals *g )
{
QObjectProxy *proxy = QOBJECT_FROM_SLOT( r );
< at >< at > -602,7 +591,6 < at >< at > void defineQObjectPrimitives()
LangPrimitiveDefiner definer;
definer.define<QObject_New>();
definer.define<QObject_Destroy>();
- definer.define<QObject_ManuallyFinalize>();
definer.define<QObject_SetParent>();
definer.define<QMetaObject_Properties>();
definer.define<QMetaObject_Methods>();
diff --git a/SCClassLibrary/QtCollider/QObject.sc b/SCClassLibrary/QtCollider/QObject.sc
index f22e415..ea0641a 100644
--- a/SCClassLibrary/QtCollider/QObject.sc
+++ b/SCClassLibrary/QtCollider/QObject.sc
< at >< at > -165,11 +165,6 < at >< at > QObject {
^this.primitiveFailed
}
- prFinalize {
- _QObject_ManuallyFinalize
- ^this.primitiveFailed
- }
-
prRelease { heap.remove(this); }
doFunction { arg f ... args; f.performList(\value, this, args); }
commit f158be344527570cea05e6f81112d1fc6843bfbe
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Fri May 4 21:58:31 2012 +0200
sclang: run all finalizers on library shutdown
Previously, only the already unreachable finalizers were run.
However, shutting down the library implicitly makes all objects unreachable,
so all finalizers need to be run.
diff --git a/include/lang/GC.h b/include/lang/GC.h
index ecd2ffc..6cb539e 100644
--- a/include/lang/GC.h
+++ b/include/lang/GC.h
< at >< at > -144,6 +144,7 < at >< at > public:
}
void FullCollection();
void ScanFinalizers();
+void RunAllFinalizers();
GCSet* GetGCSet(PyrObjectHdr* inObj);
void CompletePartialScan(PyrObject *obj);
diff --git a/lang/LangSource/GC.cpp b/lang/LangSource/GC.cpp
index 969f9da..89dafda 100644
--- a/lang/LangSource/GC.cpp
+++ b/lang/LangSource/GC.cpp
< at >< at > -756,6 +756,31 < at >< at > void PyrGC::ScanFinalizers()
}
}
+void PyrGC::RunAllFinalizers()
+{
+GCSet *gcs = &mSets[kFinalizerSet];
+
+PyrObjectHdr *obj = gcs->mBlack.next;
+while (!IsMarker(obj)) {
+Finalize((PyrObject*)obj);
+obj = obj->next;
+}
+
+obj = gcs->mWhite.next;
+PyrObjectHdr *firstFreeObj = gcs->mFree;
+while (obj != firstFreeObj) {
+Finalize((PyrObject*)obj);
+obj = obj->next;
+}
+
+obj = mGrey.next;
+while (!IsMarker(obj)) {
+if (obj->classptr == class_finalizer)
+Finalize((PyrObject*)obj);
+obj = obj->next;
+}
+}
+
bool PyrGC::SanityCheck2()
{
int numgrey = 0;
diff --git a/lang/LangSource/PyrLexer.cpp b/lang/LangSource/PyrLexer.cpp
index ca303f6..f142885 100644
--- a/lang/LangSource/PyrLexer.cpp
+++ b/lang/LangSource/PyrLexer.cpp
< at >< at > -2175,8 +2175,6 < at >< at > void aboutToCompileLibrary()
SetObject(g->sp, g->process);
runInterpreter(g, s_shutdown, 1);
-g->gc->ScanFinalizers(); // run finalizers
-
g->canCallOS = false;
}
pthread_mutex_unlock (&gLangMutex);
< at >< at > -2190,16 +2188,28 < at >< at > void closeAllCustomPorts();
void shutdownLibrary()
{
closeAllGUIScreens();
+
schedStop();
+
aboutToCompileLibrary();
TempoClock_stopAll();
pthread_mutex_lock (&gLangMutex);
+
closeAllCustomPorts();
+if (compiledOK) {
+VMGlobals *g = gMainVMGlobals;
+g->canCallOS = true;
+g->gc->RunAllFinalizers();
+g->canCallOS = false;
+}
+
pyr_pool_runtime->FreeAll();
+
compiledOK = false;
+
pthread_mutex_unlock (&gLangMutex);
}
commit 7dadbe26221452728a847b463d0f8005700f3758
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Fri May 4 22:42:01 2012 +0200
qtcollider: remove unnecessary duplicate code
QWindow:-onClose is a duplication of QView:-onClose. Remove it, and instead
just forward to the view's method.
diff --git a/SCClassLibrary/QtCollider/QWindow.sc b/SCClassLibrary/QtCollider/QWindow.sc
index 06bf1b4..d034634 100644
--- a/SCClassLibrary/QtCollider/QWindow.sc
+++ b/SCClassLibrary/QtCollider/QWindow.sc
< at >< at > -75,7 +75,7 < at >< at > QWindow
{
classvar <allWindows, <>initAction;
- var resizable, <drawFunc, <onClose;
+ var resizable, <drawFunc;
var <view;
//TODO
< at >< at > -166,10 +166,8 < at >< at > QWindow
view.setProperty( \geometry, rect.moveBy( 0, menuSpacer ) );
}
- onClose_ { arg func;
- view.manageFunctionConnection( onClose, func, 'destroyed()', false );
- onClose = func;
- }
+ onClose { ^view.onClose }
+ onClose_ { arg func; view.onClose_(func) }
// TODO
addToOnClose{ arg function; }
-----------------------------------------------------------------------
Summary of changes:
QtCollider/LanguageClient.cpp | 38 +++----------------------------
QtCollider/primitives/prim_QObject.cpp | 12 ----------
SCClassLibrary/QtCollider/QObject.sc | 5 ----
SCClassLibrary/QtCollider/QWindow.sc | 8 ++----
include/lang/GC.h | 1 +
lang/LangSource/GC.cpp | 25 +++++++++++++++++++++
lang/LangSource/PyrLexer.cpp | 14 ++++++++++-
7 files changed, 45 insertions(+), 58 deletions(-)
hooks/post-receive
</pre>
Jakob Leben
2012-05-21T18:13:42
-
SF.net Git: supercollider branch, master, updated. 3f34cdf356aa3c4150714f846d92574bf6d7f717
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50874
<pre>This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "supercollider".
The branch, master has been updated
via 3f34cdf356aa3c4150714f846d92574bf6d7f717 (commit)
from 9ad4cd17f0a7d06e3e53b7b3da7ac9911a8e0703 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3f34cdf356aa3c4150714f846d92574bf6d7f717
Author: Jakob Leben <jakob.leben-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Date: Mon May 21 14:09:05 2012 +0200
sc ide: avoid dependency on Qt >= 4.7
diff --git a/editors/sc-ide/widgets/code_editor/editor.cpp b/editors/sc-ide/widgets/code_editor/editor.cpp
index 6a6f245..0b96aec 100644
--- a/editors/sc-ide/widgets/code_editor/editor.cpp
+++ b/editors/sc-ide/widgets/code_editor/editor.cpp
< at >< at > -393,7 +393,7 < at >< at > QTextCursor CodeEditor::currentRegion()
QTextCursor c(textCursor());
QTextBlock b(c.block());
- int pos = c.positionInBlock();
+ int pos = c.position() - b.position();
BracketIterator start;
BracketIterator end;
int topLevel = 0;
< at >< at > -645,8 +645,10 < at >< at > void CodeEditor::mouseReleaseEvent ( QMouseEvent *e )
void CodeEditor::mouseDoubleClickEvent ( QMouseEvent *e )
{
QTextCursor c(textCursor());
+ QTextBlock b(c.block());
+
BracketMatch m;
- matchBracket( c.block(), c.positionInBlock(), m );
+ matchBracket( b, c.position() - b.position(), m );
if(m.pos > -1 && m.matchPos > -1)
{
c.setPosition(qMin(m.pos, m.matchPos));
-----------------------------------------------------------------------
Summary of changes:
editors/sc-ide/widgets/code_editor/editor.cpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
</pre>
Jakob Leben
2012-05-21T13:02:52
-
scide ‘class QTextCursor’ has no member named ‘positionInBlock’
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50850
<pre>The recent thread about scide made me keen to try, but I ran into a build error. I'm quite sure this error was posted before, and I thought that a fix was checked in, but even after pulling and merging into my private branch, I still get this:
[ 81%] Building CXX object editors/sc-ide/CMakeFiles/scide.dir/widgets/code_editor/editor.cpp.o
/home/dlm/share/sc.git/editors/sc-ide/widgets/code_editor/editor.cpp: In member function ‘QTextCursor ScIDE::CodeEditor::currentRegion()’:
/home/dlm/share/sc.git/editors/sc-ide/widgets/code_editor/editor.cpp:396: error: ‘class QTextCursor’ has no member named ‘positionInBlock’
/home/dlm/share/sc.git/editors/sc-ide/widgets/code_editor/editor.cpp: In member function ‘virtual void ScIDE::CodeEditor::mouseDoubleClickEvent(QMouseEvent*)’:
/home/dlm/share/sc.git/editors/sc-ide/widgets/code_editor/editor.cpp:649: error: ‘class QTextCursor’ has no member named ‘positionInBlock’
make[2]: *** [editors/sc-ide/CMakeFiles/scide.dir/widgets/code_editor/editor.cpp.o] Error 1
make[1]: *** [editors/sc-ide/CMakeFiles/scide.dir/all] Error 2
make: *** [all] Error 2
Sorry for repeating the issue -- I really don't have time this morning to go searching back through the list archives.
hjh
--
James Harkins /// dewdrop world
jamshark70-n2XjBy9Frl0FLkkUnhLBSV6hYfS7NtTn< at >public.gmane.org
http://www.dewdrop-world.net
"Come said the Muse,
Sing me a song no poet has yet chanted,
Sing me the universal." -- Whitman
blog: http://www.dewdrop-world.net/words
audio clips: http://www.dewdrop-world.net/audio
more audio: http://soundcloud.com/dewdrop_world/tracks
_______________________________________________
sc-dev mailing list
info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/
</pre>
James Harkins
2012-05-21T02:12:30
-
SChelp: Inherited methods
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50832
<pre>Would it make sense to allow the helpfile to configure which inherited methods are shown directly? This may be a good way to defragment the search for help given a specific problem ...
_______________________________________________
sc-dev mailing list
info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/
</pre>
Julian Rohrhuber
2012-05-20T17:50:11
-
qt windows dont close at reboot
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50828
<pre>Hi,
im on recent git build
9ad4cd17f0a7d06e3e53b7b3da7ac9911a8e0703
and noticed that qt windows dont close at reboot.
is this intended?
I remember that we had this issue a while ago (in the beginning of the qt gui system) but jacob/jonathan (?) fixed it...
cheers
Till
_______________________________________________
sc-dev mailing list
info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/
</pre>
Bovermann Till
2012-05-20T15:47:49
-
SF.net SVN: quarks:[2318] MathLib/HelpSource/Classes/ScatterView3d.schelp
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50813
<pre>Revision: 2318
http://quarks.svn.sourceforge.net/quarks/?rev=2318&view=rev
Author: cruxxial
Date: 2012-05-19 15:49:49 +0000 (Sat, 19 May 2012)
Log Message:
-----------
adding ScatterView3d help file
Added Paths:
-----------
MathLib/HelpSource/Classes/ScatterView3d.schelp
Added: MathLib/HelpSource/Classes/ScatterView3d.schelp
===================================================================
--- MathLib/HelpSource/Classes/ScatterView3d.schelp (rev 0)
+++ MathLib/HelpSource/Classes/ScatterView3d.schelp2012-05-19 15:49:49 UTC (rev 2318)
< at >< at > -0,0 +1,217 < at >< at >
+CLASS:: ScatterView3d
+summary:: Plot a collection of points in 3D
+categories:: GUI>Accessories
+related:: Reference/plot, Classes/Matrix
+
+DESCRIPTION::
+Plot a collection of points in 3D
+
+CLASSMETHODS::
+
+METHOD:: new
+
+argument:: parent
+Parent view or window
+
+argument:: bounds
+Bounds
+
+argument:: data
+An array of [[x1,y1,z1], [x1,y1,z2], ...[xn,yN,zN]]
+
+argument:: specX
+ControlSpec with min/max of the plotted range of dimension X
+
+argument:: specY
+ControlSpec with min/max of the plotted range of dimension Y
+
+argument:: specZ
+ControlSpec with min/max of the plotted range of dimension Z
+
+argument:: rotX
+Initial X rotation in radians
+
+argument:: rotY
+Initial Y rotation in radians
+
+argument:: rotZ
+Initial Z rotation in radians
+
+
+
+INSTANCEMETHODS::
+
+METHOD:: init3d
+private init
+
+METHOD:: data
+Get or set data array.
+
+argument:: data
+An array of [[x1,y1,z1], [x1,y1,z2], ...[xn,yN,zN]]
+
+returns:: (returnvalue)
+
+METHOD:: refresh
+Refresh the view. You will need to call this after making any changes to data or settings.
+
+
+METHOD:: rotX
+Rotate
+
+argument:: val
+radians
+
+
+METHOD:: rotY
+Rotate
+
+argument:: val
+radians
+
+
+METHOD:: rotZ
+Rotate
+
+argument:: val
+radians
+
+
+METHOD:: rot
+Rotate
+
+argument:: rX
+radians
+
+argument:: rY
+radians
+
+argument:: rZ
+radians
+
+
+METHOD:: drawMethod
+Set the shape that will be drawn for each point.
+
+argument:: method
+One of: [\fillRect, \fillOval, \strokeOval, \strokeRect]
+
+returns:: (returnvalue)
+
+METHOD:: symbolSize
+Size in pixels of the shape plotted for each point
+
+argument:: val
+pixels
+
+returns:: (returnvalue)
+
+METHOD:: symbolColor
+Color of the shape plotted for each point
+
+argument:: val
+Color
+
+returns:: (returnvalue)
+
+METHOD:: isHighlight
+Set highlighting mode which adds a crosshair at the selected point or points
+
+argument:: val
+Boolean
+
+returns:: Boolean
+
+METHOD:: highlightItem
+Highlight a point
+
+argument:: item
+Integer index in data array
+
+
+METHOD:: highlightRange
+Highlight multiple points
+
+argument:: start
+Integer index in data array
+
+argument:: end
+Integer index in data array
+
+
+METHOD:: highlightColor
+(describe method here)
+
+argument:: color
+(describe argument here)
+
+returns:: (returnvalue)
+
+METHOD:: highlightSize
+(describe method here)
+
+argument:: size
+(describe argument here)
+
+returns:: (returnvalue)
+
+METHOD:: background
+(describe method here)
+
+argument:: val
+(describe argument here)
+
+returns:: (returnvalue)
+
+METHOD:: resize
+(describe method here)
+
+argument:: resize
+(describe argument here)
+
+returns:: (returnvalue)
+
+METHOD:: pr_project
+(describe method here)
+
+returns:: (returnvalue)
+
+
+EXAMPLES::
+
+code::
+(
+var data;
+data = {{2.0.rand2}!3}!150;
+w = Window.new("3D Scatterplot", Rect(40,40, 500, 500)).front;
+a = ScatterView3d(w, Rect(10,10, 450, 450), data, [-2, 2].asSpec);
+a.drawMethod = \fillRect;
+a.symbolSize = 3;
+a.symbolColor = Color.blue;
+a.background = Color.black;
+
+// Y Slider
+Slider(w, Rect(10, 470, 450, 10)).action_{|me|
+a.rotY = me.value * 2pi;
+w.refresh;
+};
+// X Slider
+Slider(w, Rect(470, 10, 10, 450)).action_{|me|
+a.rotX = me.value * 2pi;
+w.refresh;
+};
+// Z Slider
+Slider(w, Rect(490, 10, 10, 450)).action_{|me|
+a.rotZ = me.value * 2pi;
+w.refresh;
+};
+)
+
+a.isHighlight = true;
+a.highlightColor = Color.green;
+a.highlightSize = 10< at >10;
+(
+a.highlightItem = 150.rand;
+w.refresh;
+)
+::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
_______________________________________________
sc-dev mailing list
info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/
</pre>
cruxxial-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org
2012-05-19T15:49:49
-
scide crash
http://comments.gmane.org/gmane.comp.audio.supercollider.devel/50800
<pre>Hi again,
I got into a state where scide would be crashed by my ATI driver
(fglrx on Fedora 16) immediately after launch (backtrace below). In
my Chrome browser, I happened to be looking at
http://www.openframeworks.cc/tutorials/firstSteps/004_presentations.html
which has some fancy slideshare viewers on it. I was able to stop
the crashing by switching to a different tab in Chrome, thereby
hiding the exposed slideshare window. Perhaps there is some kind of
unarbitrated contention for the GPU causing this?
- jos
Crash example and backtrace follow:
> scide
using visual class 4, id 29
hijackWindow() context created for ScIDE::MainWindow(0xa8ce10) 1
Segmentation fault (core dumped)
>
> gdb scide
GNU gdb (GDB) Fedora (7.3.50.20110722-13.fc16)
...
This GDB was configured as "x86_64-redhat-linux-gnu".
...
Reading symbols from /usr/local/bin/scide...done.
(gdb) r
Starting program: /usr/local/bin/scide
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1".
using visual class 4, id 29
[New Thread 0x7fffeb9e7700 (LWP 18477)]
Detaching after fork from child process 18478.
hijackWindow() context created for ScIDE::MainWindow(0xa09960) 1
Program received signal SIGSEGV, Segmentation fault.
0x00007ffff05a9880 in ?? () from /usr/lib64/dri/fglrx_dri.so
Missing separate debuginfos, use: debuginfo-install
GConf2-3.2.3-1.fc16.x86_64 ORBit2-2.14.19-2.fc15.x86_64
PackageKit-gtk-module-0.6.22-2.fc16.x86_64 atk-2.2.0-2.fc16.x86_64
avahi-glib-0.6.30-4.fc16.x86_64 avahi-libs-0.6.30-4.fc16.x86_64
cairo-1.10.2-4.fc16.x86_64 dbus-glib-0.92-2.fc15.x86_64
dbus-libs-1.4.10-3.fc16.x86_64 expat-2.1.0-1.fc16.x86_64
fontconfig-2.8.0-4.fc16.x86_64 freetype-2.4.6-5.fc16.x86_64
gdk-pixbuf2-2.24.1-1.fc16.x86_64 glib2-2.30.3-1.fc16.x86_64
glibc-2.14.90-24.fc16.6.x86_64 gnome-vfs2-2.24.4-6.fc16.x86_64
gtk2-2.24.8-3.fc16.x86_64 gtk2-engines-2.20.2-2.fc15.x86_64
keyutils-libs-1.5.2-1.fc16.x86_64 krb5-libs-1.9.3-1.fc16.x86_64
lcms-libs-1.19-4.fc16.x86_64 libICE-1.0.7-1.fc16.x86_64
libSM-1.2.0-2.fc15.x86_64 libX11-1.4.3-1.fc16.x86_64
libXau-1.0.6-2.fc15.x86_64 libXcomposite-0.4.3-2.fc15.x86_64
libXcursor-1.1.11-3.fc15.x86_64 libXdamage-1.1.3-2.fc15.x86_64
libXext-1.3.0-1.fc16.x86_64 libXfixes-5.0-1.fc16.x86_64
libXi-1.4.5-1.fc16.x86_64 libXinerama-1.1.1-2.fc15.x86_64
libXrandr-1.3.1-2.fc15.x86_64 libXrender-0.9.6-2.fc15.x86_64
libart_lgpl-2.3.21-2.fc15.x86_64 libbonobo-2.32.1-1.fc16.x86_64
libbonoboui-2.24.5-1.fc16.x86_64 libcanberra-0.28-3.fc16.x86_64
libcanberra-gtk2-0.28-3.fc16.x86_64 libcom_err-1.41.14-2.fc15.x86_64
libffi-3.0.10-1.fc16.x86_64 libgcc-4.6.3-2.fc16.x86_64
libgcrypt-1.5.0-2.fc16.x86_64 libgnome-2.32.1-2.fc15.x86_64
libgnome-keyring-3.2.0-1.fc16.x86_64
libgnomecanvas-2.30.3-2.fc15.x86_64 libgnomeui-2.24.5-2.fc15.x86_64
libgpg-error-1.10-1.fc16.x86_64 libicu-4.6-4.fc16.x86_64
libjpeg-turbo-1.2.0-1.fc16.x86_64 libmng-1.0.10-5.fc15.x86_64
libogg-1.2.2-3.fc15.x86_64 libpng-1.2.49-1.fc16.x86_64
libselinux-2.1.6-6.fc16.x86_64 libstdc++-4.6.3-2.fc16.x86_64
libtdb-1.2.9-10.fc16.x86_64 libtiff-3.9.5-3.fc16.x86_64
libtool-ltdl-2.4-9.fc16.x86_64 libuuid-2.20.1-2.3.fc16.x86_64
libvorbis-1.3.3-1.fc16.x86_64 libxcb-1.7-3.fc16.x86_64
libxml2-2.7.8-6.fc16.x86_64 nss-softokn-freebl-3.13.4-1.fc16.x86_64
openssl-1.0.0i-1.fc16.x86_64 pango-1.29.4-1.fc16.x86_64
pixman-0.24.4-1.fc16.x86_64 popt-1.13-9.fc16.x86_64
qt-4.8.1-5.fc16.x86_64 qt-x11-4.8.1-5.fc16.x86_64 zlib-1.2.5-6.fc16.x86_64
(gdb)
(gdb) bt
#0 0x00007ffff05a9880 in ?? () from /usr/lib64/dri/fglrx_dri.so
#1 0x00007ffff05935f2 in ?? () from /usr/lib64/dri/fglrx_dri.so
#2 0x00007ffff0117ba0 in ?? () from /usr/lib64/dri/fglrx_dri.so
#3 0x00007ffff011846e in ?? () from /usr/lib64/dri/fglrx_dri.so
#4 0x00007ffff011e0e7 in ?? () from /usr/lib64/dri/fglrx_dri.so
#5 0x00007fffeff5bf57 in ?? () from /usr/lib64/dri/fglrx_dri.so
#6 0x00007fffef6c01f9 in ?? () from /usr/lib64/dri/fglrx_dri.so
#7 0x00007fffef6c0413 in ?? () from /usr/lib64/dri/fglrx_dri.so
#8 0x000000347c2437fb in ?? () from /usr/lib64/libQtOpenGL.so.4
#9 0x000000347c244879 in
QGLFramebufferObject::QGLFramebufferObject(QSize const&,
QGLFramebufferObjectFormat const&) () from /usr/lib64/libQtOpenGL.so.4
#10 0x000000347c2764ca in QGLWindowSurface::updateGeometry() ()
from /usr/lib64/libQtOpenGL.so.4
#11 0x000000347c277936 in QGLWindowSurface::beginPaint(QRegion const&) ()
from /usr/lib64/libQtOpenGL.so.4
#12 0x00000038cdfe0f2a in ?? () from /usr/lib64/libQtGui.so.4
#13 0x00000038cde0c4f0 in QWidgetPrivate::syncBackingStore() ()
from /usr/lib64/libQtGui.so.4
#14 0x00000038cde37dc8 in ?? () from /usr/lib64/libQtGui.so.4
#15 0x00000038cde44f1f in QApplication::x11ProcessEvent(_XEvent*) ()
from /usr/lib64/libQtGui.so.4
#16 0x00000038cde6cbdc in ?? () from /usr/lib64/libQtGui.so.4
#17 0x00000038cca44f3d in g_main_context_dispatch ()
---Type <return> to continue, or q <return> to quit---
from /lib64/libglib-2.0.so.0
#18 0x00000038cca45738 in ?? () from /lib64/libglib-2.0.so.0
#19 0x00000038cca4590c in g_main_context_iteration ()
from /lib64/libglib-2.0.so.0
#20 0x00000038cd7a85bf in
QEventDispatcherGlib::processEvents(QFlags<QEventLoop::ProcessEventsFlag>)
() from /usr/lib64/libQtCore.so.4
#21 0x00000038cde6c8ce in ?? () from /usr/lib64/libQtGui.so.4
#22 0x00000038cd778a12 in
QEventLoop::processEvents(QFlags<QEventLoop::ProcessEventsFlag>) ()
from /usr/lib64/libQtCore.so.4
#23 0x00000038cd778c67 in
QEventLoop::exec(QFlags<QEventLoop::ProcessEventsFlag>) () from
/usr/lib64/libQtCore.so.4
#24 0x00000038cd77d665 in QCoreApplication::exec() ()
from /usr/lib64/libQtCore.so.4
#25 0x000000000043711a in main (argc=1, argv=<optimized out>)
at /l/scg/editors/sc-ide/core/main.cpp:58
(gdb)
Julius O. Smith III <jos-l0SEpsmuUtBegcJQxxnBRDe48wsgrGvP< at >public.gmane.org>
Prof. of Music and Assoc. Prof. (by courtesy) of Electrical Engineering
CCRMA, Stanford University
http://ccrma.stanford.edu/~jos/
_______________________________________________
sc-dev mailing list
info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/
</pre>
Julius Smith
2012-05-18T21:05:49
Search Engine
Search the mailing list at Gmane
query
http://search.gmane.org/?group=$group=gmane.comp.audio.supercollider.devel