Changeset 1274

Timestamp:

10/05/07 22:29:44 (11 months ago)

Author:

calvin

Message:

pattern editor theming - added new .col mappings for "PE Text Note" and "PE Text Shade", minor build fixes

Location:

trunk

Files:

• buzelib-vs.vcproj (modified) (3 diffs)
• src/buzelib/BuzeConfiguration.cpp (modified) (1 diff)
• src/buzelib/MachineParameterView.cpp (modified) (2 diffs)
• src/buzelib/MainFrm.cpp (modified) (1 diff)
• src/buzelib/PatternEditor/PatternEditorControl.cpp (modified) (2 diffs)
• src/buzelib/PatternEditor/PatternEditorControl.h (modified) (1 diff)
• src/buzelib/PatternView.cpp (modified) (3 diffs)
• src/buzelib/PatternView.h (modified) (1 diff)
• src/buzelib/Preferences/MidiInputPreferencesView.cpp (modified) (1 diff)
• src/buzelib/Preferences/MidiOutputPreferencesView.cpp (modified) (1 diff)
• src/buzelib/Preferences/PreferencesDialog.cpp (modified) (1 diff)
• src/buzelib/PresetDialog.cpp (modified) (1 diff)

trunk/buzelib-vs.vcproj

@@ -126 +126 @@
                         </File>
                         <File
-                                RelativePath=".\src\buzelib\DragDropImpl.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\src\buzelib\EditorActions.cpp">
                         </File>
@@ -135 +132 @@
                         </File>
                         <File
-                                RelativePath=".\src\buzelib\Fft.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\src\buzelib\FileBrowserList.cpp">
                         </File>
@@ -154 +148 @@
                         <File
                                 RelativePath=".\src\buzelib\MachineFolderView.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\src\buzelib\MachineIndex.cpp">
                         </File>
                         <File

trunk/src/buzelib/BuzeConfiguration.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 #include "BuzeConfiguration.h"
-#include "utils.h"
+#include "Utils/utils.h"
 
 using namespace std;

trunk/src/buzelib/MachineParameterView.cpp

@@ -135 +135 @@
 
         zzub::metaplugin* plugin = machine;
-/*      if (plugin->getType() != plugin_type_generator) {
+        if ((plugin->getFlags() & PLUGIN_FLAGS_MASK) != GENERATOR_PLUGIN_FLAGS) {
                 plugin = document->getSelectedMachine(0);
-                if (!plugin || plugin->getType() != plugin_type_generator) return 0;
-        }
-*/
+                if (!plugin || ((plugin->getFlags() & PLUGIN_FLAGS_MASK) != GENERATOR_PLUGIN_FLAGS)) return 0;
+        }
+
         if (document->isNotePlaying(plugin, note)) return 0;
 
@@ -151 +151 @@
 
         zzub::metaplugin* plugin = machine;
-/*      if (plugin->getType() != plugin_type_generator) {
+        if ((plugin->getFlags() & PLUGIN_FLAGS_MASK) != GENERATOR_PLUGIN_FLAGS) {
                 plugin = document->getSelectedMachine(0);
-                if (!plugin || plugin->getType() != plugin_type_generator) return 0;
-        }
-*/
+                if (!plugin || ((plugin->getFlags() & PLUGIN_FLAGS_MASK) != GENERATOR_PLUGIN_FLAGS)) return 0;
+        }
+
         document->playMachineNote(plugin, zzub::note_value_off, note);
         return 0;

trunk/src/buzelib/MainFrm.cpp

@@ -2641 +2641 @@
         { "PE Sel BG", RGB(0xF7, 0xF7, 0xF4) }, 
         { "PE Text", RGB(0x30, 0x30, 0x21) }, 
+        { "PE Text Note", RGB(0x20, 0x20, 0x80) }, 
+        { "PE Text Shade", RGB(0x68, 0x68, 0x68) }, 
         { "SA Amp BG", RGB(0x70, 0x80, 0x90) }, 
         { "SA Amp Line", RGB(0x00, 0xC8, 0x00) }, 

trunk/src/buzelib/PatternEditor/PatternEditorControl.cpp

@@ -12 +12 @@
 LRESULT CPatternEditorControl::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
         editor.Create(m_hWnd, rcDefault, "", WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL);
-
-        //editor.SetThemeColor(PE_BG, RGB(0xDA, 0xD6, 0xC9));
-        //editor.SetThemeColor(PE_Text, RGB(0, 0, 0));
-        //editor.SetThemeColor(PE_BG_Dark, RGB(0xBD, 0xB5, 0x9F));
-        //editor.SetThemeColor(PE_BG_VeryDark, RGB(0x9F, 0x93, 0x73));
-        //editor.SetThemeColor(PE_Sel_BG, RGB(0xFF, 0xFF, 0xFF));
-        //editor.SetHighlightRows(12, 3);
-        //editor.SetSkip(4);
-
         return 0;
 }
@@ -39 +30 @@
         int screenrows = editor.rcClient.bottom / editor.font_size.cy;
 
-        COLORREF bgcolor = RGB(0xDA, 0xD6, 0xC9);
+        COLORREF bgcolor = editor.colors[PE_BG];
         screenDC.SelectFont(editor.track_font);
         screenDC.SetBkColor(bgcolor);

trunk/src/buzelib/PatternEditor/PatternEditorControl.h

@@ -94 +94 @@
         void SetFont(HFONT hFont, bool bRedraw = 1);
         void UpdatePlayPosition(int pos);
+        void SetThemeColor(theme_index index, COLORREF color) { editor.SetThemeColor(index, color); }
+
 };

trunk/src/buzelib/PatternView.cpp

@@ -202 +202 @@
         setPatternEditorFont();
 
+        bindTheme();
         bindPatternEditor();
 
@@ -519 +520 @@
                         break;
                 case UpdateTheme:
-                        patternEditor.UpdateWindow();
+                        bindTheme();
                         break;
                 case UpdatePatternSelection:
@@ -1781 +1782 @@
                 }
         }
-
-
-}
+}
+
+void CPatternView::bindTheme() {
+        patternEditor.SetThemeColor(PE_BG, mainFrame->getThemeColor("PE BG"));
+        patternEditor.SetThemeColor(PE_BG_Dark, mainFrame->getThemeColor("PE BG Dark"));
+        patternEditor.SetThemeColor(PE_BG_VeryDark, mainFrame->getThemeColor("PE BG Very Dark"));
+        patternEditor.SetThemeColor(PE_Sel_BG, mainFrame->getThemeColor("PE Sel BG"));
+        patternEditor.SetThemeColor(PE_TextValue, mainFrame->getThemeColor("PE Text"));
+        patternEditor.SetThemeColor(PE_TextNote, mainFrame->getThemeColor("PE Text Note"));
+        patternEditor.SetThemeColor(PE_TextShade, mainFrame->getThemeColor("PE Text Shade"));
+        patternEditor.SetThemeColor(PE_BG_Dark, mainFrame->getThemeColor("PE BG Dark"));
+        patternEditor.Invalidate();
+        patternEditor.editor.Invalidate(FALSE);
+}

trunk/src/buzelib/PatternView.h

@@ -318 +318 @@
     void bindStatus();
     void bindToolbar();
+        void bindTheme();
 
         void deletePatternSelection();

trunk/src/buzelib/Preferences/MidiInputPreferencesView.cpp

@@ -8 +8 @@
 #include "MainFrm.h"
 #include "MidiInputPreferencesView.h"
-#include "utils.h"
+#include "../Utils/utils.h"
 
 using namespace std;

trunk/src/buzelib/Preferences/MidiOutputPreferencesView.cpp

@@ -8 +8 @@
 #include "MainFrm.h"
 #include "MidiOutputPreferencesView.h"
-#include "utils.h"
+#include "../Utils/utils.h"
 
 using namespace std;

trunk/src/buzelib/Preferences/PreferencesDialog.cpp

@@ -12 +12 @@
 #include "PreferencesDialog.h"
 
-#include "utils.h"
+#include "../Utils/utils.h"
 
 using namespace std;

trunk/src/buzelib/PresetDialog.cpp

@@ -2 +2 @@
 #include "resource.h"
 #include "PresetDialog.h"
-#include "PresetManager.h"
-#include "utils.h"
+#include "Utils/PresetManager.h"
+#include "Utils/utils.h"
 
 CPresetDialog::CPresetDialog(PresetManager* prs, zzub::metaplugin* plug) {