Changeset 545

Timestamp:

10/01/08 11:27:24 (2 months ago)

Author:

wolke

Message:

merge changes on trunk into audiofilebrowser branche

Files:

• branches/audiofilebrowser/gui/src/SongEditor/SongEditor.cpp (modified) (1 diff)
• branches/audiofilebrowser/gui/src/SoundLibrary/SoundLibraryPanel.cpp (modified) (1 diff)

branches/audiofilebrowser/gui/src/SongEditor/SongEditor.cpp

@@ -1271 +1271 @@
-{
-        QString sText = event->mimeData()->text();
-
-
-
+
+
+
+
+
-
-        if (sText.startsWith("move pattern:")) {

branches/audiofilebrowser/gui/src/SoundLibrary/SoundLibraryPanel.cpp

@@ -409 +409 @@
-                }
-
+                if ( __sound_library_tree->currentItem()->parent() == __song_item )
+                {
+                        return;
+                }
+
-                if ( __sound_library_tree->currentItem()->parent()->text(0) == NULL )
-                {
+                        return;
+                }
+
+                if ( __sound_library_tree->currentItem()->parent() == __pattern_item ) {
-                        return;
-                }