Changeset 1323

Timestamp:

12/27/07 01:58:56 (10 months ago)

Author:

calvin

Message:

move theme stuff into a separate ThemeManager? class

Location:

trunk/src/buzelib

Files:

• BuzeConfiguration.cpp (modified) (1 diff)
• MachineView.cpp (modified) (2 diffs)
• MainFrm.cpp (modified) (8 diffs)
• MainFrm.h (modified) (2 diffs)
• PatternView.cpp (modified) (2 diffs)
• SequenceEditor.cpp (modified) (4 diffs)
• Utils/ThemeManager.cpp (added)
• Utils/ThemeManager.h (added)
• buze.cpp (modified) (2 diffs)
• buze.h (modified) (2 diffs)

trunk/src/buzelib/BuzeConfiguration.cpp

@@ -176 +176 @@
 
 std::string CConfiguration::getTheme() {
-        string theme;
-        if (!getConfigString("Settings", "Theme", &theme))
-                return "";
+        string theme = "<default>";
+        getConfigString("Settings", "Theme", &theme);
         return theme;
 }

trunk/src/buzelib/MachineView.cpp

@@ -14 +14 @@
 #include "../libzzub/bmxwriter.h"
 #include "Utils/utils.h"
+#include "Utils/ThemeManager.h"
 #include <iomanip>
 #include <strstream>
@@ -94 +95 @@
         if (linePen) linePen.DeleteObject();
 
-        masterBgBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Master"));
-        masterLedOnBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Master LED On"));
-        masterLedOffBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Master LED Off"));
-
-        generatorBgBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Generator"));
-        generatorMuteBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Generator Mute"));
-        generatorPanBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Generator Pan BG"));
-        generatorLedOnBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Generator LED On"));
-        generatorLedOffBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Generator LED Off"));
-
-        effectBgBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Effect"));
-        effectMuteBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Effect Mute"));
-        effectPanBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Effect Pan BG"));
-        effectLedOnBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Generator LED On"));
-        effectLedOffBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Generator LED Off"));
-
-    backgroundColor = mainFrame->getThemeColor("MV Background");
-
-        borderPen.CreatePen(PS_SOLID, 1, mainFrame->getThemeColor("MV Machine Border"));
-        linePen.CreatePen(PS_SOLID, 1, mainFrame->getThemeColor("MV Line"));
-
-        panHandleBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Pan Handle"));
-        arrowBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Arrow"));
-        ampBgBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Amp BG"));
-        ampHandleBrush.CreateSolidBrush(mainFrame->getThemeColor("MV Amp Handle"));
+        masterBgBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Master"));
+        masterLedOnBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Master LED On"));
+        masterLedOffBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Master LED Off"));
+
+        generatorBgBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Generator"));
+        generatorMuteBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Generator Mute"));
+        generatorPanBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Generator Pan BG"));
+        generatorLedOnBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Generator LED On"));
+        generatorLedOffBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Generator LED Off"));
+
+        effectBgBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Effect"));
+        effectMuteBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Effect Mute"));
+        effectPanBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Effect Pan BG"));
+        effectLedOnBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Generator LED On"));
+        effectLedOffBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Generator LED Off"));
+
+    backgroundColor = _Module.themes->getThemeColor("MV Background");
+
+        borderPen.CreatePen(PS_SOLID, 1, _Module.themes->getThemeColor("MV Machine Border"));
+        linePen.CreatePen(PS_SOLID, 1, _Module.themes->getThemeColor("MV Line"));
+
+        panHandleBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Pan Handle"));
+        arrowBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Arrow"));
+        ampBgBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Amp BG"));
+        ampHandleBrush.CreateSolidBrush(_Module.themes->getThemeColor("MV Amp Handle"));
 
         dirtyBackground = true;

trunk/src/buzelib/MainFrm.cpp

@@ -27 +27 @@
 
 #include "Utils/utils.h"
+#include "Utils/ThemeManager.h"
 #include "../libzzub/archive.h"
 #include "../libzzub/bmxreader.h"
@@ -2549 +2550 @@
 LRESULT CMainFrame::OnSetTheme(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
         int themeIndex = wID - ID_SET_THEME_FIRST;
-        setTheme(getThemeName(themeIndex));
+        std::string themeName = _Module.themes->getThemeName(themeIndex);
+        setTheme(themeName);
         return 0;
 }
@@ -2785 +2787 @@
 LRESULT CMainFrame::OnMeasureItem(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
         LPMEASUREITEMSTRUCT lpMeasureItem = (LPMEASUREITEMSTRUCT)lParam;
-        //MachineSeparator& msep = *(MachineSeparator*)lpMeasureItem->itemData;
-
-        MachineMenuItem* item = (MachineMenuItem*)lpMeasureItem->itemData;//plur.getItem(msep.identifier);
+        MachineMenuItem* item = (MachineMenuItem*)lpMeasureItem->itemData;
 
         lpMeasureItem->itemWidth = item->style->headerWidth;
@@ -2797 +2797 @@
 LRESULT CMainFrame::OnDrawItem(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
         LPDRAWITEMSTRUCT lpDrawItem = (LPDRAWITEMSTRUCT)lParam;
-        //MachineSeparator& msep = *(MachineSeparator*)lpDrawItem->itemData;
-
-        //MachineMenuItem* item = plur.getItem(msep.identifier);
         MachineMenuItem* item = (MachineMenuItem*)lpDrawItem->itemData;
-
         plur.drawItem(lpDrawItem, item);
-
         return 0;
 }
@@ -2814 +2809 @@
 
 // themes       
-
-struct default_theme_type {
-        const char* name;
-        COLORREF color;
-};
-
-default_theme_type defaultTheme[] = {
-        { "MV Amp BG", RGB(0xAA, 0xAA, 0xAA) }, 
-        { "MV Amp Handle", RGB(0x00, 0x00, 0x00) }, 
-        { "MV Arrow", RGB(0xC8, 0xC8, 0xC8) }, 
-        { "MV Background", RGB(0xDA, 0xD6, 0xC9) }, 
-        { "MV Effect", RGB(0xC7, 0xAD, 0xA9) }, 
-        { "MV Effect LED Off", RGB(0x64, 0x1E, 0x1E) }, 
-        { "MV Effect LED On", RGB(0xFF, 0x64, 0x64) }, 
-        { "MV Effect Mute", RGB(0x9F, 0x8A, 0x87) }, 
-        { "MV Effect Pan BG", RGB(0x92, 0x65, 0x5F) }, 
-        { "MV Generator", RGB(0xA9, 0xAE, 0xC7) }, 
-        { "MV Generator LED Off", RGB(0x28, 0x28, 0x8C) }, 
-        { "MV Generator LED On", RGB(0x64, 0x64, 0xFF) }, 
-        { "MV Generator Mute", RGB(0x87, 0x8B, 0x9F) }, 
-        { "MV Generator Pan BG", RGB(0x5F, 0x67, 0x92) }, 
-        { "MV Machine Text", RGB(0x00, 0x00, 0x00) }, 
-        { "MV Master", RGB(0xC6, 0xBE, 0xAA) }, 
-        { "MV Master LED Off", RGB(0x59, 0x59, 0x22) }, 
-        { "MV Master LED On", RGB(0xE8, 0xE8, 0xC1) }, 
-        { "MV Pan Handle", RGB(0x00, 0x00, 0x00) }, 
-        { "MV Line", RGB(0x00, 0x00, 0x00) }, 
-        { "MV Machine Border", RGB(0x00, 0x00, 0x00) }, 
-        { "PE BG", RGB(0xDA, 0xD6, 0xC9) }, 
-        { "PE BG Dark", RGB(0xBD, 0xB5, 0x9F) }, 
-        { "PE BG Very Dark", RGB(0x9F, 0x93, 0x73) }, 
-        { "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) }, 
-        { "PE Text Margin", RGB(0x7F, 0x73, 0x53) },
-        { "PE Text Note Off", RGB(0xdd, 0x33, 0xdd) },
-        { "SA Amp BG", RGB(0x70, 0x80, 0x90) }, 
-        { "SA Amp Line", RGB(0x00, 0xC8, 0x00) }, 
-        { "SA Freq BG", RGB(0x00, 0x00, 0x00) }, 
-        { "SA Freq Line", RGB(0x00, 0xC8, 0x00) }, 
-        { "SE BG", RGB(0xDA, 0xD6, 0xC9) }, 
-        { "SE BG Dark", RGB(0xBD, 0xB5, 0x9F) }, 
-        { "SE BG Very Dark", RGB(0x9F, 0x93, 0x73) }, 
-        { "SE Line", RGB(0x00, 0x00, 0x00) }, 
-        { "SE Sel BG", RGB(0xF7, 0xF7, 0xF4) }, 
-        { "SE Text", RGB(0x30, 0x30, 0x21) }, 
-};
-
-const size_t defaultThemeCount = sizeof(defaultTheme) / sizeof(default_theme_type);
 
 void CMainFrame::initializeThemes() {
@@ -2878 +2823 @@
 
         themeMenu.CreatePopupMenu();
-        themes.clear();
-        themes.push_back("<default>");
-        themeMenu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, ID_SET_THEME_FIRST, "<default>");
-
-        WIN32_FIND_DATA fd;
-        string searchPath = "Themes/*.col";
-        HANDLE hFind=FindFirstFile(searchPath.c_str(), &fd);
-        while (hFind!=INVALID_HANDLE_VALUE) {
-                if ( (fd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)==0) {
-                        string name = fd.cFileName;
-                        size_t ld = name.find_last_of('.');
-                        if (ld == string::npos) continue;
-                        //string ext = name.substr(ld+1);
-                        name = name.substr(0, ld);
-                        themeMenu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, ID_SET_THEME_FIRST + themes.size(), name.c_str());
-                        themes.push_back(name);
-                }
-                if (!FindNextFile(hFind, &fd)) break;
-        }
-        FindClose(hFind);
-
+
+        for (size_t i = 0; i < _Module.themes->getThemes(); i++) {
+                string name = _Module.themes->getThemeName(i);
+                themeMenu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, ID_SET_THEME_FIRST + i, name.c_str());
+        }
 
         for (int i = 0; i < viewMenu.GetMenuItemCount(); i++) {
@@ -2912 +2841 @@
         string themeName = _Module.configuration->getTheme();
         setTheme(themeName);
-
-}
-
-size_t CMainFrame::getThemes() {
-        return themes.size();
-}
-
-std::string CMainFrame::getThemeName(size_t index) {
-        return themes[index];
-}
-
-void CMainFrame::setDefaultOverrideColor(std::string dest, std::string src) {
-        map<string, COLORREF>::iterator i;
-
-        if (theme.find(dest) != theme.end())
-                return;
-
-        i = theme.find(src);
-
-        if (i != theme.end())
-                theme.insert(pair<string, COLORREF>(dest, i->second));
 }
 
 void CMainFrame::setTheme(std::string themeName) {
-
-        theme.clear();
-
-
-        FileReader reader;
-        string fileName = "Themes/" + themeName + ".col";
-        if (reader.open(fileName.c_str())) {
-
-                while (!reader.eof()) {
-                        std::string line=trim(reader.readLine());
-                        if (line.length()==0) continue;
-                        if (line.at(0)=='#') continue;
-                        
-                        size_t lt = line.find_first_of('\t');
-                        if (lt == string::npos) continue;
-
-                        string name = trim(line.substr(0, lt));
-                        string colorstr = trim(line.substr(lt+1));
-                        if (colorstr.length() != 6) continue;
-
-                        COLORREF color = RGB(
-                                intFromHex(colorstr.substr(0, 2)),
-                                intFromHex(colorstr.substr(2, 2)),
-                                intFromHex(colorstr.substr(4, 2))
-                        );
-                        theme[name] = color;
-                }
-                reader.close();
-        }
-
-#if 0 // Uncomment this so that legacy buzz themes look their best with buze's new theme values
-
-        // Theme-based defaults
-
-        setDefaultOverrideColor("PE Text Note",         "PE Text");
-        setDefaultOverrideColor("PE Text Note Off",     "PE Text");
-        setDefaultOverrideColor("PE Text Shade",        "PE Text");
-        setDefaultOverrideColor("PE Text Margin",       "PE Text Note");
-
-#endif
-
-        // Defaults
-
-        for (unsigned int i = 0; i< defaultThemeCount; i++) {
-                if (theme.find(defaultTheme[i].name) == theme.end())
-                        theme.insert(pair<string, COLORREF>(defaultTheme[i].name, defaultTheme[i].color));
-        }
-
-        document->updateAllViews(0, UpdateTheme);
+        _Module.themes->loadTheme(themeName);
+        document->updateAllViews(0, UpdateTheme, 0);
 
         char menuName[1024];
@@ -2997 +2858 @@
 
         _Module.configuration->setTheme(themeName);
-}
-
-COLORREF CMainFrame::getThemeColor(std::string name) {
-        map<string, COLORREF>::iterator i = theme.find(name);
-        if ( i == theme.end()) return 0;
-        return i->second;
 }
 

trunk/src/buzelib/MainFrm.h

@@ -187 +187 @@
         CMenu createMachineMenu;
         PlurManager plur;
-        std::vector<std::string> themes;
-        std::map<std::string, COLORREF> theme;
         std::vector<std::string> recents;
 
@@ -559 +557 @@
         // themes
         void initializeThemes();
-        size_t getThemes();
-        std::string getThemeName(size_t index);
         void setTheme(std::string theme);
-        void setDefaultOverrideColor(std::string dest, std::string src);
-        COLORREF getThemeColor(std::string name);
 
         // Recent Songs

trunk/src/buzelib/PatternView.cpp

@@ -11 +11 @@
 #include "Properties.h"
 #include "Utils/utils.h"
+#include "Utils/ThemeManager.h"
 #include "EditorActions.h"
 #include "../libzzub/archive.h"
@@ -1863 +1864 @@
 
 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_TextMargin, mainFrame->getThemeColor("PE Text Margin"));
-        patternEditor.SetThemeColor(PE_TextNote, mainFrame->getThemeColor("PE Text Note"));
-        patternEditor.SetThemeColor(PE_TextNoteOff, mainFrame->getThemeColor("PE Text Note Off"));
-        patternEditor.SetThemeColor(PE_TextShade, mainFrame->getThemeColor("PE Text Shade"));
-        patternEditor.SetThemeColor(PE_BG_Dark, mainFrame->getThemeColor("PE BG Dark"));
+        patternEditor.SetThemeColor(PE_BG, _Module.themes->getThemeColor("PE BG"));
+        patternEditor.SetThemeColor(PE_BG_Dark, _Module.themes->getThemeColor("PE BG Dark"));
+        patternEditor.SetThemeColor(PE_BG_VeryDark, _Module.themes->getThemeColor("PE BG Very Dark"));
+        patternEditor.SetThemeColor(PE_Sel_BG, _Module.themes->getThemeColor("PE Sel BG"));
+        patternEditor.SetThemeColor(PE_TextValue, _Module.themes->getThemeColor("PE Text"));
+        patternEditor.SetThemeColor(PE_TextMargin, _Module.themes->getThemeColor("PE Text Margin"));
+        patternEditor.SetThemeColor(PE_TextNote, _Module.themes->getThemeColor("PE Text Note"));
+        patternEditor.SetThemeColor(PE_TextNoteOff, _Module.themes->getThemeColor("PE Text Note Off"));
+        patternEditor.SetThemeColor(PE_TextShade, _Module.themes->getThemeColor("PE Text Shade"));
+        patternEditor.SetThemeColor(PE_BG_Dark, _Module.themes->getThemeColor("PE BG Dark"));
         patternEditor.Invalidate();
         patternEditor.editor.Invalidate(FALSE);

trunk/src/buzelib/SequenceEditor.cpp

@@ -8 +8 @@
 #include "SequenceView.h"
 #include "Properties.h"
+#include "Utils/ThemeManager.h"
 #include "../libzzub/archive.h"
 #include "../libzzub/recorder.h"
@@ -348 +349 @@
 
         CPenHandle prevPen = (HPEN)SelectObject(dc, bgPen.m_hPen);
-        dc.SetTextColor(mainFrame->getThemeColor("SE Text"));
-        dc.SetBkColor(mainFrame->getThemeColor("SE BG"));
+        dc.SetTextColor(_Module.themes->getThemeColor("SE Text"));
+        dc.SetBkColor(_Module.themes->getThemeColor("SE BG"));
 //      dc.SetBkColor(RGB(0xDA, 0xD6, 0xC9));
         
@@ -411 +412 @@
 
                 //dc.SetTextColor(0);
-                dc.SetBkColor(mainFrame->getThemeColor("SE BG"));
+                dc.SetBkColor(_Module.themes->getThemeColor("SE BG"));
 
                 // determine highlight color
                 if(stepIncrement && miniStepIncrement) {
                         if (!(row % stepIncrement)) {
-                                dc.SetBkColor(mainFrame->getThemeColor("SE BG Very Dark"));
+                                dc.SetBkColor(_Module.themes->getThemeColor("SE BG Very Dark"));
                                 lastStep = row;
                         }
                         else if (row - lastStep == miniStepIncrement) {
-                                dc.SetBkColor(mainFrame->getThemeColor("SE BG Dark"));
+                                dc.SetBkColor(_Module.themes->getThemeColor("SE BG Dark"));
                                 lastStep = row;
                         }
@@ -995 +996 @@
         if (selBrush) selBrush.DeleteObject();
 
-        blackBrush.CreateSolidBrush(mainFrame->getThemeColor("SE Line"));
-        bgPen.CreatePen(PS_NULL, 0, mainFrame->getThemeColor("SE Line"));
-        bgBrush.CreateSolidBrush(mainFrame->getThemeColor("SE BG"));
-    bgShadeBrush.CreateSolidBrush(mainFrame->getThemeColor("SE BG Dark"));
-//    bgShadeBrush.CreateSolidBrush(RGB((float)0xDA * 0.95, (float)0xD6* 0.95, (float)0xC9* 0.95));
-//      selBrush.CreateSolidBrush(RGB(0xFF, 0xFF, 0xFF));
-        selBrush.CreateSolidBrush(mainFrame->getThemeColor("SE Sel BG"));
+        blackBrush.CreateSolidBrush(_Module.themes->getThemeColor("SE Line"));
+        bgPen.CreatePen(PS_NULL, 0, _Module.themes->getThemeColor("SE Line"));
+        bgBrush.CreateSolidBrush(_Module.themes->getThemeColor("SE BG"));
+        bgShadeBrush.CreateSolidBrush(_Module.themes->getThemeColor("SE BG Dark"));
+        selBrush.CreateSolidBrush(_Module.themes->getThemeColor("SE Sel BG"));
 
         invalidateSequencer();

trunk/src/buzelib/buze.cpp

@@ -9 +9 @@
 #include "buze.h"
 #include "Utils/utils.h"
+#include "Utils/ThemeManager.h"
 #include "../libzzub/tools.h"
 #ifndef _USE_OLD_IOSTREAMS
@@ -91 +92 @@
         // hide but do not show wait window
         waitWindow.Create(GetDesktopWindow());
+
+        themes = new ThemeManager();
+        themes->initialize();
 }
 

trunk/src/buzelib/buze.h

@@ -3 +3 @@
 class CMainFrame;
 class CConfiguration;
+class ThemeManager;
 
 struct MachineSkin {
@@ -36 +37 @@
         CConfiguration* configuration;
         CWaitWindow waitWindow;
+        ThemeManager* themes;
 
         CBuzeModule();