summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/synti/deicsonze/CMakeLists.txt5
-rw-r--r--muse2/synti/deicsonze/deicsonze.qrc26
-rw-r--r--muse2/synti/deicsonze/deicsonzegui.ui88
-rw-r--r--muse2/synti/fluidsynth/CMakeLists.txt4
5 files changed, 78 insertions, 46 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 65b0e6bf..ac5d8036 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -4,6 +4,7 @@
- Fixed some QMenu usages without parent and/or delete. (Tim)
- DeicsOnze: Fixed: Crash in ctor, _preset not init. by time loadConfiguration called. Re-arranged.
And 3 popup QMenu usages without delete. Test OK. (Tim)
+ - Deicsonze: Fixed all missing icons throughout. Added qrc file, changed ui file. Looks nice now. (Tim)
12.12.2010:
- Integrated the translation system into cmake. Added a -DUPDATE_TRANSLATIONS flag to cmake
which will update the .ts files in the source tree with the newest strings. I used this to
diff --git a/muse2/synti/deicsonze/CMakeLists.txt b/muse2/synti/deicsonze/CMakeLists.txt
index 0b4e0afb..05546081 100644
--- a/muse2/synti/deicsonze/CMakeLists.txt
+++ b/muse2/synti/deicsonze/CMakeLists.txt
@@ -25,6 +25,10 @@ QT4_WRAP_CPP ( deicsonze_mocs deicsonzegui.h )
file (GLOB UI_FILES deicsonzegui.ui )
QT4_WRAP_UI ( deicsonze_uis ${UI_FILES} )
+QT4_ADD_RESOURCES (deicsonze_qrc_files
+ deicsonze.qrc
+ )
+
file (GLOB SOURCE_FILES
deicsonze.cpp
deicsonzepreset.cpp
@@ -40,6 +44,7 @@ add_library ( deicsonze SHARED
${PROJECT_BINARY_DIR}/all-pic.h.pch
${deicsonze_mocs}
${deicsonze_uis}
+ ${deicsonze_qrc_files}
)
set (FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${SOURCE_FILES} ${UI_FILES} CACHE INTERNAL "")
diff --git a/muse2/synti/deicsonze/deicsonze.qrc b/muse2/synti/deicsonze/deicsonze.qrc
new file mode 100644
index 00000000..62092ca9
--- /dev/null
+++ b/muse2/synti/deicsonze/deicsonze.qrc
@@ -0,0 +1,26 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+ <qresource>
+ <file>pics/SHold.png</file>
+ <file>pics/algo1.png</file>
+ <file>pics/algo2.png</file>
+ <file>pics/algo3.png</file>
+ <file>pics/algo4.png</file>
+ <file>pics/algo5.png</file>
+ <file>pics/algo6.png</file>
+ <file>pics/algo7.png</file>
+ <file>pics/algo8.png</file>
+ <file>pics/sawUp.png</file>
+ <file>pics/square.png</file>
+ <file>pics/triangl.png</file>
+ <file>pics/wave1.png</file>
+ <file>pics/wave2.png</file>
+ <file>pics/wave3.png</file>
+ <file>pics/wave4.png</file>
+ <file>pics/wave5.png</file>
+ <file>pics/wave6.png</file>
+ <file>pics/wave7.png</file>
+ <file>pics/wave8.png</file>
+ </qresource>
+</RCC>
+
diff --git a/muse2/synti/deicsonze/deicsonzegui.ui b/muse2/synti/deicsonze/deicsonzegui.ui
index 6b91cf49..28f18695 100644
--- a/muse2/synti/deicsonze/deicsonzegui.ui
+++ b/muse2/synti/deicsonze/deicsonzegui.ui
@@ -713,7 +713,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/sawUp.png</iconset>
+ <iconset>:/pics/sawUp.png</iconset>
</property>
</item>
<item>
@@ -721,7 +721,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/square.png</iconset>
+ <iconset>:/pics/square.png</iconset>
</property>
</item>
<item>
@@ -729,7 +729,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/triangl.png</iconset>
+ <iconset>:/pics/triangl.png</iconset>
</property>
</item>
<item>
@@ -737,7 +737,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/SHold.png</iconset>
+ <iconset>:/pics/SHold.png</iconset>
</property>
</item>
</widget>
@@ -932,7 +932,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/algo1.png</iconset>
+ <iconset>:/pics/algo1.png</iconset>
</property>
</item>
<item>
@@ -940,7 +940,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/algo3.png</iconset>
+ <iconset>:/pics/algo3.png</iconset>
</property>
</item>
<item>
@@ -948,7 +948,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/algo3.png</iconset>
+ <iconset>:/pics/algo3.png</iconset>
</property>
</item>
<item>
@@ -956,7 +956,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/algo4.png</iconset>
+ <iconset>:/pics/algo4.png</iconset>
</property>
</item>
<item>
@@ -964,7 +964,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/algo5.png</iconset>
+ <iconset>:/pics/algo5.png</iconset>
</property>
</item>
<item>
@@ -972,7 +972,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/algo6.png</iconset>
+ <iconset>:/pics/algo6.png</iconset>
</property>
</item>
<item>
@@ -980,7 +980,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/algo7.png</iconset>
+ <iconset>:/pics/algo7.png</iconset>
</property>
</item>
<item>
@@ -988,7 +988,7 @@
<string/>
</property>
<property name="icon" >
- <iconset>pics/algo8.png</iconset>
+ <iconset>:/pics/algo8.png</iconset>
</property>
</item>
</widget>
@@ -1575,7 +1575,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave1.png</iconset>
+ <iconset>:/pics/wave1.png</iconset>
</property>
</item>
<item>
@@ -1583,7 +1583,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave2.png</iconset>
+ <iconset>:/pics/wave2.png</iconset>
</property>
</item>
<item>
@@ -1591,7 +1591,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave3.png</iconset>
+ <iconset>:/pics/wave3.png</iconset>
</property>
</item>
<item>
@@ -1599,7 +1599,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave4.png</iconset>
+ <iconset>:/pics/wave4.png</iconset>
</property>
</item>
<item>
@@ -1607,7 +1607,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave5.png</iconset>
+ <iconset>:/pics/wave5.png</iconset>
</property>
</item>
<item>
@@ -1615,7 +1615,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave6.png</iconset>
+ <iconset>:/pics/wave6.png</iconset>
</property>
</item>
<item>
@@ -1623,7 +1623,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave7.png</iconset>
+ <iconset>:/pics/wave7.png</iconset>
</property>
</item>
<item>
@@ -1631,7 +1631,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave8.png</iconset>
+ <iconset>:/pics/wave8.png</iconset>
</property>
</item>
</widget>
@@ -2560,7 +2560,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave1.png</iconset>
+ <iconset>:/pics/wave1.png</iconset>
</property>
</item>
<item>
@@ -2568,7 +2568,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave2.png</iconset>
+ <iconset>:/pics/wave2.png</iconset>
</property>
</item>
<item>
@@ -2576,7 +2576,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave3.png</iconset>
+ <iconset>:/pics/wave3.png</iconset>
</property>
</item>
<item>
@@ -2584,7 +2584,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave4.png</iconset>
+ <iconset>:/pics/wave4.png</iconset>
</property>
</item>
<item>
@@ -2592,7 +2592,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave5.png</iconset>
+ <iconset>:/pics/wave5.png</iconset>
</property>
</item>
<item>
@@ -2600,7 +2600,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave6.png</iconset>
+ <iconset>:/pics/wave6.png</iconset>
</property>
</item>
<item>
@@ -2608,7 +2608,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave7.png</iconset>
+ <iconset>:/pics/wave7.png</iconset>
</property>
</item>
<item>
@@ -2616,7 +2616,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave8.png</iconset>
+ <iconset>:/pics/wave8.png</iconset>
</property>
</item>
</widget>
@@ -3374,7 +3374,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave1.png</iconset>
+ <iconset>:/pics/wave1.png</iconset>
</property>
</item>
<item>
@@ -3382,7 +3382,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave2.png</iconset>
+ <iconset>:/pics/wave2.png</iconset>
</property>
</item>
<item>
@@ -3390,7 +3390,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave3.png</iconset>
+ <iconset>:/pics/wave3.png</iconset>
</property>
</item>
<item>
@@ -3398,7 +3398,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave4.png</iconset>
+ <iconset>:/pics/wave4.png</iconset>
</property>
</item>
<item>
@@ -3406,7 +3406,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave5.png</iconset>
+ <iconset>:/pics/wave5.png</iconset>
</property>
</item>
<item>
@@ -3414,7 +3414,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave6.png</iconset>
+ <iconset>:/pics/wave6.png</iconset>
</property>
</item>
<item>
@@ -3422,7 +3422,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave7.png</iconset>
+ <iconset>:/pics/wave7.png</iconset>
</property>
</item>
<item>
@@ -3430,7 +3430,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave8.png</iconset>
+ <iconset>:/pics/wave8.png</iconset>
</property>
</item>
</widget>
@@ -4182,7 +4182,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave1.png</iconset>
+ <iconset>:/pics/wave1.png</iconset>
</property>
</item>
<item>
@@ -4190,7 +4190,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave2.png</iconset>
+ <iconset>:/pics/wave2.png</iconset>
</property>
</item>
<item>
@@ -4198,7 +4198,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave3.png</iconset>
+ <iconset>:/pics/wave3.png</iconset>
</property>
</item>
<item>
@@ -4206,7 +4206,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave4.png</iconset>
+ <iconset>:/pics/wave4.png</iconset>
</property>
</item>
<item>
@@ -4214,7 +4214,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave5.png</iconset>
+ <iconset>:/pics/wave5.png</iconset>
</property>
</item>
<item>
@@ -4222,7 +4222,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave6.png</iconset>
+ <iconset>:/pics/wave6.png</iconset>
</property>
</item>
<item>
@@ -4230,7 +4230,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave7.png</iconset>
+ <iconset>:/pics/wave7.png</iconset>
</property>
</item>
<item>
@@ -4238,7 +4238,7 @@ Wave form 8 = &lt;i>if &lt;b>t&lt;/b>&amp;#060 pi then sin(2*&lt;b>t&lt;/b>)*sin
<string/>
</property>
<property name="icon" >
- <iconset>pics/wave8.png</iconset>
+ <iconset>:/pics/wave8.png</iconset>
</property>
</item>
</widget>
diff --git a/muse2/synti/fluidsynth/CMakeLists.txt b/muse2/synti/fluidsynth/CMakeLists.txt
index c812cee1..41aef6a9 100644
--- a/muse2/synti/fluidsynth/CMakeLists.txt
+++ b/muse2/synti/fluidsynth/CMakeLists.txt
@@ -68,5 +68,5 @@ install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ fluidsyn
# FIXME: Won't work
# install_files ( /${MusE_INSTALL_NAME}/synthi TODO README.txt )
-install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/synthi TODO )
-install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/synthi README.txt )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/synthi/fluidsynth TODO )
+install_files ( /${SHARE_INSTALL_PREFIX}/${MusE_INSTALL_NAME}/synthi/fluidsynth README.txt )
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:31:02 +0000