Changeset 1304

Timestamp:

11/07/07 22:08:56 (10 months ago)

Author:

calvin

Message:

zonajs patch: configurable "highlighting spaced points on the 'stepline' on the sequencer."
also: a remix of ld0ds paste selection patch, fix possible crash in propertyview if the selected item is deleted

Location:

trunk/src/buzelib

Files:

• BuzeConfiguration.cpp (modified) (1 diff)
• BuzeConfiguration.h (modified) (1 diff)
• EditorActions.cpp (modified) (1 diff)
• MachineView.cpp (modified) (3 diffs)
• MainFrm.cpp (modified) (2 diffs)
• PropertyListView.cpp (modified) (1 diff)
• SequenceEditor.cpp (modified) (1 diff)

trunk/src/buzelib/BuzeConfiguration.cpp

@@ -288 +288 @@
         return dw;
 }
+
+void CConfiguration::setSequencerStepHigh(int sz) {
+        setConfigNumber("Settings", "SequencerStepHigh", sz);
+}
+
+void CConfiguration::setSequencerStepLow(int sz) {
+        setConfigNumber("Settings", "SequencerStepLow", sz);
+}
+
+int CConfiguration::getSequencerStepHigh() {
+        DWORD dw = 0;
+        getConfigNumber("Settings", "SequencerStepHigh", &dw);
+        return dw;
+}
+
+int CConfiguration::getSequencerStepLow() {
+        DWORD dw = 0;
+        getConfigNumber("Settings", "SequencerStepLow", &dw);
+        return dw;
+}

trunk/src/buzelib/BuzeConfiguration.h

@@ -55 +55 @@
         std::string getExternalWaveEditor();
 
+        void setSequencerStepHigh(int sz);
+        void setSequencerStepLow(int sz);
+        int getSequencerStepHigh();
+        int getSequencerStepLow();
+        
+
 };

trunk/src/buzelib/EditorActions.cpp

@@ -971 +971 @@
         bool status = reader.readPlayer(document->player);
 
+        document->clearSelectedMachines();
+        
+        for (size_t i = 0; i < reader.machines.size(); i++)
+                if ((reader.machines[i]->loader->plugin_info->flags & zzub::plugin_flag_is_root) == 0) {
+                        document->selectMachine(reader.machines[i]);
+                }
+
+
     if (!status)
                 MessageBox(GetForegroundWindow(), document->player->getLoadErrors().c_str(), "Load error", MB_OK|MB_ICONERROR);

trunk/src/buzelib/MachineView.cpp

@@ -1107 +1107 @@
 
 metaplugin* CMachineView::getMachineAtPt(POINT pt, RECT* machineRect) {
-        for (size_t i=0; i<player->getMachines(); i++) {
+        for (int i = player->getMachines() - 1; i >= 0; i--) {
                 metaplugin* m = player->getMachine(i);
                 if (m->nonSongPlugin) continue;
@@ -1666 +1666 @@
                 case UpdateOpenDocument:
                         ledStates.clear();
-                        document->clearSelectedMachines();
-                        document->selectMachine(document->player->master);
                         break;
                 case UpdateDeleteMachine:
@@ -1717 +1715 @@
 }
 
+

trunk/src/buzelib/MainFrm.cpp

@@ -1505 +1505 @@
 
 bool CMainFrame::openSongFromFile(std::string fileName, bool clearAll) {
+        document->clearSelectedMachines();
+        document->selectMachine(document->player->master);
 
         debug((string)"Open " + fileName);
@@ -1547 +1549 @@
         }
         //player->getMaster()->releaseEvent(progressEventID);
-
-        document->updateAllViews(0, UpdateOpenDocument);
 
         _Module.hideWaitWindow();

trunk/src/buzelib/PropertyListView.cpp

@@ -134 +134 @@
                         if (document->selectedPropertyProvider->isData(pHint)) {
                                 clearAll();
+                                delete document->selectedPropertyProvider;
+                                document->selectedPropertyProvider = 0;
                         }
                         break;

trunk/src/buzelib/SequenceEditor.cpp

@@ -353 +353 @@
         char pc[64];
 
+        size_t stepIncrement = document->configuration->getSequencerStepHigh();
+        size_t miniStepIncrement = document->configuration->getSequencerStepLow();
+
+        size_t lastStep = 0;
+        size_t row = scrollRows * getScale();
+
+        // determine last step (for highlighting)
+        if(row && stepIncrement && miniStepIncrement) {
+                if (row > stepIncrement)
+                        while (lastStep < row - stepIncrement)
+                                lastStep += stepIncrement;
+                while (!(lastStep + miniStepIncrement >= row))
+                        lastStep += miniStepIncrement;
+        }
+
         // draw row numbers
         for (size_t j=0; j<maxRows; j++) {
-                sprintf(pc, "%7i ", (scrollRows+j)*getScale());
-
+
+                row = (scrollRows + j) * getScale();
                 RECT mrc;
+
+                sprintf(pc, "%7i ", row);
+
                 SetRect(&mrc, 0, y, cellWidth+1,y+17);
                 dc.Rectangle(&mrc);
 
                 //dc.SetTextColor(0);
+                dc.SetBkColor(mainFrame->getThemeColor("SE BG"));
+
+                // determine highlight color
+                if(stepIncrement && miniStepIncrement) {
+                        if (!(row % stepIncrement)) {
+                                dc.SetBkColor(mainFrame->getThemeColor("SE BG Very Dark"));
+                                lastStep = row;
+                        }
+                        else if (row - lastStep == miniStepIncrement) {
+                                dc.SetBkColor(mainFrame->getThemeColor("SE BG Dark"));
+                                lastStep = row;
+                        }
+                }
+                dc.FillSolidRect(&mrc, dc.GetBkColor());
 
                 mrc.right-=8;