Menu
▾
▴
[Rosegarden-bugs] SF.net SVN: rosegarden:[10239] branches/newcontrolrulers
|
From: <cjn...@us...> - 2009-04-25 16:41:54
|
Revision: 10239
http://rosegarden.svn.sourceforge.net/rosegarden/?rev=10239&view=rev
Author: cjnfryer
Date: 2009-04-25 16:41:48 +0000 (Sat, 25 Apr 2009)
Log Message:
-----------
This time with the new files added ... I hate doing that.
Modified Paths:
--------------
branches/newcontrolrulers/.cproject
branches/newcontrolrulers/.project
branches/newcontrolrulers/.settings/org.eclipse.cdt.core.prefs
branches/newcontrolrulers/scripts/rg-gui-existingseq.launch
branches/newcontrolrulers/src/gui/editors/matrix/MatrixWidget.cpp
branches/newcontrolrulers/src/gui/rulers/ControlRuler.cpp
branches/newcontrolrulers/src/gui/rulers/ControlRuler.h
branches/newcontrolrulers/src/gui/rulers/ControllerEventsRuler.cpp
Added Paths:
-----------
branches/newcontrolrulers/src/gui/rulers/ControlRulerWidget.cpp
branches/newcontrolrulers/src/gui/rulers/ControlRulerWidget.h
Modified: branches/newcontrolrulers/.cproject
===================================================================
--- branches/newcontrolrulers/.cproject 2009-04-25 05:23:19 UTC (rev 10238)
+++ branches/newcontrolrulers/.cproject 2009-04-25 16:41:48 UTC (rev 10239)
@@ -1,9 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?>
<cproject>
<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="converted.config.634752939">
+<cconfiguration id="0.1982678181">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1982678181" moduleId="org.eclipse.cdt.core.settings" name="Default">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="NewControlRuler" buildProperties="" description="" id="0.1982678181" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+<folderInfo id="0.1982678181." name="/" resourcePath="">
+<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.586332128" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.586332128.419747050" name=""/>
+<builder arguments="-f qt4-makefile.pup_cj" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.742756176" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1437391739" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+<tool id="org.eclipse.cdt.build.core.settings.holder.799718557" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.902450459" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1891121679" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2078541586" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1529114466" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1486693432" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+</toolChain>
+</folderInfo>
+<sourceEntries>
+<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
+<entry excluding="src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+</sourceEntries>
+</configuration>
+</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
@@ -16,57 +50,167 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
+<parser enabled="true"/>
</scannerInfoProvider>
</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
+<parser enabled="true"/>
</scannerInfoProvider>
</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="0.1982678181">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="makefileGenerator">
<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
+<parser enabled="true"/>
</scannerInfoProvider>
</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
</storageModule>
-
-<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.634752939" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-</extensions>
-</storageModule>
-
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-
-<storageModule moduleId="org.eclipse.cdt.core.pathentry">
-<pathentry excluding="RGbuild/" kind="src" path=""/>
-<pathentry excluding="cache/" kind="out" path=""/>
-<pathentry kind="out" path="RGbuild"/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-<pathentry kind="mac" name="slots" path="" value=""/>
-<pathentry kind="mac" name="signals" path="" value="protected"/>
-</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
+<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
</cconfiguration>
</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="NewControlRuler.null.13902899" name="NewControlRuler"/>
+</storageModule>
</cproject>
Modified: branches/newcontrolrulers/.project
===================================================================
--- branches/newcontrolrulers/.project 2009-04-25 05:23:19 UTC (rev 10238)
+++ branches/newcontrolrulers/.project 2009-04-25 16:41:48 UTC (rev 10239)
@@ -1,90 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>rosegarden</name>
+ <name>NewControlRuler</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.cdt.make.core.makeBuilder</name>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
- <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
- <value>true</value>
+ <key>?name?</key>
+ <value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.stopOnError</key>
- <value>false</value>
+ <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+ <value>all</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
- <value>true</value>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value>-f qt4-makefile.pup_cj</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.build.command</key>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.build.target.inc</key>
- <value>all</value>
+ <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+ <value>clean</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.build.arguments</key>
- <value>-j2 VERBOSE=1</value>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.build.target.full</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.environment</key>
- <value></value>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.build.target.auto</key>
- <value>all</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
- <value>false</value>
- </dictionary>
- <dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.build.target.clean</key>
- <value>clean</value>
+ <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+ <value>all</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.make.core.build.location</key>
- <value></value>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
</dictionary>
<dictionary>
- <key>org.eclipse.cdt.core.errorOutputParser</key>
- <value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;</value>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>false</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.cdt.core.cnature</nature>
- <nature>org.eclipse.cdt.make.core.makeNature</nature>
- <nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ <nature>org.eclipse.cdt.core.cnature</nature>
</natures>
</projectDescription>
Modified: branches/newcontrolrulers/.settings/org.eclipse.cdt.core.prefs
===================================================================
--- branches/newcontrolrulers/.settings/org.eclipse.cdt.core.prefs 2009-04-25 05:23:19 UTC (rev 10238)
+++ branches/newcontrolrulers/.settings/org.eclipse.cdt.core.prefs 2009-04-25 16:41:48 UTC (rev 10239)
@@ -1,5 +1,4 @@
-#Sun Aug 12 09:05:12 GMT+01:00 2007
+#Sat Apr 25 10:28:50 GMT+08:00 2009
eclipse.preferences.version=1
indexer/indexerId=org.eclipse.cdt.core.fastIndexer
indexerId=org.eclipse.cdt.core.fastIndexer
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
Modified: branches/newcontrolrulers/scripts/rg-gui-existingseq.launch
===================================================================
--- branches/newcontrolrulers/scripts/rg-gui-existingseq.launch 2009-04-25 05:23:19 UTC (rev 10238)
+++ branches/newcontrolrulers/scripts/rg-gui-existingseq.launch 2009-04-25 16:41:48 UTC (rev 10239)
@@ -1,31 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.cdt.launch.localCLaunch">
+<booleanAttribute key="org.eclipse.cdt.debug.mi.core.AUTO_SOLIB" value="true"/>
+<listAttribute key="org.eclipse.cdt.debug.mi.core.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.DEBUG_NAME" value="gdb"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.GDB_INIT" value=""/>
+<listAttribute key="org.eclipse.cdt.debug.mi.core.SOLIB_PATH"/>
+<booleanAttribute key="org.eclipse.cdt.debug.mi.core.STOP_ON_SOLIB_EVENTS" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_ID" value="org.eclipse.cdt.debug.mi.core.CDebugger"/>
-<stringAttribute key="org.eclipse.cdt.launch.protocol" value="mi"/>
-<booleanAttribute key="org.eclipse.cdt.debug.mi.core.STOP_ON_SOLIB_EVENTS" value="false"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="run"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.cdt.debug.mi.core.SOLIB_PATH"/>
<booleanAttribute key="org.eclipse.cdt.launch.ENABLE_REGISTER_BOOKKEEPING" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.mi.core.AUTO_SOLIB" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="false"/>
-<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
-<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="rosegarden"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="RGbuild/rosegarden"/>
-<stringAttribute key="org.eclipse.cdt.debug.mi.core.DEBUG_NAME" value="gdb"/>
<booleanAttribute key="org.eclipse.cdt.launch.ENABLE_VARIABLE_BOOKKEEPING" value="false"/>
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="--nofork --nosplash --existingsequencer"/>
-<listAttribute key="org.eclipse.cdt.debug.mi.core.AUTO_SOLIB_LIST"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="RGbuild/rosegarden"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="rosegarden"/>
+<stringAttribute key="org.eclipse.cdt.launch.protocol" value="mi"/>
+<booleanAttribute key="org.eclipse.cdt.launch.use_terminal" value="true"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/rosegarden"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="PATH" value="${env_var:RGINSTALL}/usr/bin:${env_var:PATH}"/>
<mapEntry key="KDEDIRS" value="${env_var:RGINSTALL}/usr"/>
<mapEntry key="KDE_DEBUG" value="1"/>
-<mapEntry key="PATH" value="${env_var:RGINSTALL}/usr/bin:${env_var:PATH}"/>
</mapAttribute>
-<stringAttribute key="org.eclipse.cdt.debug.mi.core.GDB_INIT" value=""/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
</launchConfiguration>
Modified: branches/newcontrolrulers/src/gui/editors/matrix/MatrixWidget.cpp
===================================================================
--- branches/newcontrolrulers/src/gui/editors/matrix/MatrixWidget.cpp 2009-04-25 05:23:19 UTC (rev 10238)
+++ branches/newcontrolrulers/src/gui/editors/matrix/MatrixWidget.cpp 2009-04-25 16:41:48 UTC (rev 10239)
@@ -103,12 +103,18 @@
connect(m_view, SIGNAL(pannedRectChanged(QRectF)),
m_pianoView, SLOT(slotSetPannedRect(QRectF)));
+ connect(m_view, SIGNAL(pannedRectChanged(QRectF)),
+ m_controlsWidget, SLOT(slotSetPannedRect(QRectF)));
+
connect(m_hpanner, SIGNAL(pannedRectChanged(QRectF)),
m_view, SLOT(slotSetPannedRect(QRectF)));
connect(m_hpanner, SIGNAL(pannedRectChanged(QRectF)),
m_pianoView, SLOT(slotSetPannedRect(QRectF)));
+ connect(m_hpanner, SIGNAL(pannedRectChanged(QRectF)),
+ m_controlsWidget, SLOT(slotSetPannedRect(QRectF)));
+
connect(m_hpanner, SIGNAL(zoomIn()),
this, SLOT(slotZoomInFromPanner()));
Modified: branches/newcontrolrulers/src/gui/rulers/ControlRuler.cpp
===================================================================
--- branches/newcontrolrulers/src/gui/rulers/ControlRuler.cpp 2009-04-25 05:23:19 UTC (rev 10238)
+++ branches/newcontrolrulers/src/gui/rulers/ControlRuler.cpp 2009-04-25 16:41:48 UTC (rev 10239)
@@ -76,7 +76,7 @@
m_mainHorizontalScrollBar(0),
m_rulerScale(rulerScale),
m_eventSelection(new EventSelection(*segment)),
- m_assignedEventSelection(0),
+ m_assignedEventSelection(0),
m_segment(segment),
m_currentIndex(0),
m_tool(0),
@@ -138,18 +138,19 @@
{
RG_DEBUG << "ControlRuler::paintEvent";
QPainter painter(this);
-
+
QPen pen;
QBrush brush;
-
+
pen.setStyle(Qt::NoPen);
painter.setPen(pen);
-
+
brush.setStyle(Qt::SolidPattern);
brush.setColor(Qt::white);
painter.setBrush(brush);
-
- painter.drawRect(0,0,width(),height());
+
+// QPoint pCentre(width()/2,height()/2);
+// painter.drawRect(m_pannedRect.left()+pCentre.x(),0,m_pannedRect.right()+pCentre.x(),height());
}
void ControlRuler::slotScrollHorizSmallSteps(int step)
@@ -158,8 +159,11 @@
void ControlRuler::slotUpdateElementsHPos()
{
+ // Update the position of control elements based on changes to the segment
+ // This is only called for PropertControlRulers
RG_DEBUG << "ControlRuler::slotUpdateElementsHPos()\n";
+ // This is only called for PropertControlRulers
computeViewSegmentOffset();
// Q3CanvasItemList list = canvas()->allItems();
@@ -194,6 +198,11 @@
// RG_DEBUG << "ControlRuler::layoutItem ControlItem x = " << x << " - width = " << width << endl;
}
+void ControlRuler::slotSetPannedRect(QRectF pr)
+{
+ m_pannedRect = pr;
+}
+
void ControlRuler::setControlTool(ControlTool* tool)
{
if (m_tool)
@@ -482,7 +491,7 @@
//Q3CanvasItemList l = getSelectionRectangle()->collisions(true);
ControlItemList l; ///CJ Write collisions code!
-
+
// for (Q3CanvasItemList::Iterator it = l.begin(); it != l.end(); ++it) {
for (ControlItemList::iterator it = l.begin(); it != l.end(); ++it) {
Modified: branches/newcontrolrulers/src/gui/rulers/ControlRuler.h
===================================================================
--- branches/newcontrolrulers/src/gui/rulers/ControlRuler.h 2009-04-25 05:23:19 UTC (rev 10238)
+++ branches/newcontrolrulers/src/gui/rulers/ControlRuler.h 2009-04-25 16:41:48 UTC (rev 10239)
@@ -78,9 +78,9 @@
virtual QString getName() = 0;
virtual QSize sizeHint() { return QSize(1,100); }
-
+
virtual void paintEvent(QPaintEvent *);
-
+
int getMaxItemValue() { return m_maxItemValue; }
void setMaxItemValue(int val) { m_maxItemValue = val; }
@@ -92,7 +92,7 @@
// Q3CanvasRectangle* getSelectionRectangle() { return m_selectionRect; }
QRect* getSelectionRectangle() { return m_selectionRect; }
-
+
virtual void setSegment(Segment *segment);
virtual void setRulerScale(RulerScale *rulerscale) { m_rulerScale = rulerscale; }
@@ -126,6 +126,7 @@
virtual void slotUpdate();
virtual void slotUpdateElementsHPos();
virtual void slotScrollHorizSmallSteps(int);
+ virtual void slotSetPannedRect(QRectF);
protected:
virtual void contentsMousePressEvent(QMouseEvent*);
@@ -171,10 +172,12 @@
ControlItem* m_currentIndex;
// Q3CanvasItemList m_selectedItems;
- ControlItemList m_selectedItems;
+ ControlItemList m_selectedItems;
ControlTool *m_tool;
+ QRectF m_pannedRect;
+
int m_maxItemValue;
double m_viewSegmentOffset;
Added: branches/newcontrolrulers/src/gui/rulers/ControlRulerWidget.cpp
===================================================================
--- branches/newcontrolrulers/src/gui/rulers/ControlRulerWidget.cpp (rev 0)
+++ branches/newcontrolrulers/src/gui/rulers/ControlRulerWidget.cpp 2009-04-25 16:41:48 UTC (rev 10239)
@@ -0,0 +1,122 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
+
+/*
+ Rosegarden
+ A MIDI and audio sequencer and musical notation editor.
+ Copyright 2000-2009 the Rosegarden development team.
+
+ Other copyrights also apply to some parts of this work. Please
+ see the AUTHORS file and individual file headers for details.
+
+ 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. See the file
+ COPYING included with this distribution for more information.
+*/
+#include "ControlRulerWidget.h"
+
+#include "ControlRuler.h"
+#include "ControlParameter.h"
+#include "ControllerEventsRuler.h"
+#include "RulerScale.h"
+
+#include "document/RosegardenDocument.h"
+#include "base/Controllable.h"
+#include "base/MidiDevice.h"
+
+#include "misc/Debug.h"
+
+#include <QStackedWidget>
+
+namespace Rosegarden
+{
+
+ControlRulerWidget::ControlRulerWidget() :
+m_segment(0),
+m_scale(0)
+{
+}
+
+ControlRulerWidget::~ControlRulerWidget()
+{
+}
+
+void ControlRulerWidget::setSegments(RosegardenDocument *document, std::vector<Segment *> segments)
+{
+ m_document = document;
+// m_segments = segments;
+
+// connect(m_document, SIGNAL(pointerPositionChanged(timeT)),
+// this, SLOT(slotPointerPositionChanged(timeT)));
+
+ Composition &comp = document->getComposition();
+
+ Track *track =
+ comp.getTrackById(segments[0]->getTrack());
+
+ Instrument *instr = document->getStudio().
+ getInstrumentById(track->getInstrument());
+
+ SegmentSelection selection;
+ selection.insert(segments.begin(), segments.end());
+
+ delete m_scale;
+ m_scale = new SegmentsRulerScale(&m_document->getComposition(),
+ selection,
+ 0,
+ Note(Note::Shortest).getDuration() / 2.0);
+
+ // This is single segment code
+ m_segment = segments[0];
+
+///TEMP CODE
+ if (!m_controlRulerList.size()) {
+ Controllable *c = dynamic_cast<MidiDevice *>(instr->getDevice());
+ const ControlList &list = c->getControlParameters();
+ RG_DEBUG << "ControlRulerWidget::setSegments - Device control parameters:";
+ for (ControlList::const_iterator it = list.begin();it != list.end(); ++it) {
+ if (it->getName() == "Volume")
+ slotAddControlRuler(*it);
+ }
+ }
+///TEMP CODE END
+
+ RG_DEBUG << "ControlRulerWidget::setSegments Widget contains " << m_controlRulerList.size() << " rulers.";
+
+ if (m_controlRulerList.size()) {
+ std::list<ControlRuler *>::iterator it;
+ for (it = m_controlRulerList.begin(); it != m_controlRulerList.end(); ++it) {
+ (*it)->setSegment(m_segment);
+ (*it)->setRulerScale(m_scale);
+ }
+ }
+}
+
+void ControlRulerWidget::slotAddControlRuler(const ControlParameter &controlParameter)
+{
+ ControlRuler *controlruler = new ControllerEventsRuler(m_segment, m_scale, this, &controlParameter);
+ addWidget(controlruler);
+ m_controlRulerList.push_back(controlruler);
+}
+
+void ControlRulerWidget::slotSetPannedRect(QRectF pr)
+{
+ // Current Panned.cpp code uses QGraphicsView::centreOn this point
+ ///TODO Note these rectangles are currently wrong
+ RG_DEBUG << "ControlRulerWidget::slotSetPannedRect - " << pr;
+
+ // Ruler widgets should draw this region (using getTimeForX from the segment) so pass the rectangle on
+ // Provided rectangle should be centered on current widget size
+ // No zooming yet. This will confuse things somewhat
+// if (m_controlRulerList.size()) {
+// std::list<ControlRuler *>::iterator it;
+// for (it = m_controlRulerList.begin(); it != m_controlRulerList.end(); ++it) {
+// (*it)->slotSetPannedRect(pr);
+// }
+// }
+}
+
+}
+
+#include "ControlRulerWidget.moc"
Added: branches/newcontrolrulers/src/gui/rulers/ControlRulerWidget.h
===================================================================
--- branches/newcontrolrulers/src/gui/rulers/ControlRulerWidget.h (rev 0)
+++ branches/newcontrolrulers/src/gui/rulers/ControlRulerWidget.h 2009-04-25 16:41:48 UTC (rev 10239)
@@ -0,0 +1,57 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
+
+/*
+ Rosegarden
+ A MIDI and audio sequencer and musical notation editor.
+ Copyright 2000-2009 the Rosegarden development team.
+
+ Other copyrights also apply to some parts of this work. Please
+ see the AUTHORS file and individual file headers for details.
+
+ 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. See the file
+ COPYING included with this distribution for more information.
+*/
+
+#ifndef _RG_CONTROLRULERWIDGET_H_
+#define _RG_CONTROLRULERWIDGET_H_
+
+#include <QStackedWidget>
+
+namespace Rosegarden
+{
+
+class RosegardenDocument;
+class Segment;
+class ControlRuler;
+class ControlParameter;
+class RulerScale;
+
+class ControlRulerWidget : public QStackedWidget //, Observer
+{
+Q_OBJECT
+
+public:
+ ControlRulerWidget();
+ virtual ~ControlRulerWidget();
+
+ void setSegments(RosegardenDocument *document,
+ std::vector<Segment *> segments);
+
+public slots:
+ void slotAddControlRuler(const ControlParameter &);
+ void slotSetPannedRect(QRectF pr);
+
+protected:
+ std::list<ControlRuler *> m_controlRulerList;
+
+ RosegardenDocument *m_document;
+ Segment *m_segment;
+ RulerScale *m_scale;
+};
+
+}
+
+#endif
Modified: branches/newcontrolrulers/src/gui/rulers/ControllerEventsRuler.cpp
===================================================================
--- branches/newcontrolrulers/src/gui/rulers/ControllerEventsRuler.cpp 2009-04-25 05:23:19 UTC (rev 10238)
+++ branches/newcontrolrulers/src/gui/rulers/ControllerEventsRuler.cpp 2009-04-25 16:41:48 UTC (rev 10239)
@@ -4,10 +4,10 @@
Rosegarden
A MIDI and audio sequencer and musical notation editor.
Copyright 2000-2009 the Rosegarden development team.
-
+
Other copyrights also apply to some parts of this work. Please
see the AUTHORS file and individual file headers for details.
-
+
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
@@ -80,6 +80,10 @@
setMenuName("controller_events_ruler_menu");
// drawBackground(); Now in paintEvent
init();
+
+ RG_DEBUG << "ControllerEventsRuler::ControllerEventsRuler - " << controller->getName();
+ RG_DEBUG << "Segment from " << segment->getStartTime() << " to " << segment->getEndTime();
+ RG_DEBUG << "Position x = " << rulerScale->getXForTime(segment->getStartTime()) << " to " << rulerScale->getXForTime(segment->getEndTime());
}
void
@@ -108,7 +112,7 @@
return;
setMaxItemValue(m_controller->getMax());
-
+
for (Segment::iterator i = m_segment->begin();
i != m_segment->end(); ++i) {
@@ -121,7 +125,7 @@
int width=m_rulerScale->getXForTime((*i)->getDuration());
RG_DEBUG << "ControllerEventsRuler:init - width = " << width;
//int width = 100;
-
+
// Check for specific controller value if we need to
//
if (m_controller->getType() == Controller::EventType) {
@@ -255,7 +259,7 @@
// &ok, this, &intValidator);
QString res = InputDialog::getText(this, "", tr("Controller Event Number"),
LineEdit::Normal, "0", &ok);
-
+
if (ok)
number = res.toULong();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|