Changeset 1328

Timestamp:

12/27/07 22:34:45 (8 months ago)

Author:

calvin

Message:

new preferences almost works

Location:

trunk/src/buzelib

Files:

• MainFrm.cpp (modified) (1 diff)
• PreferencesView.cpp (modified) (3 diffs)
• PreferencesViewProperties.cpp (modified) (8 diffs)
• PreferencesViewProperties.h (modified) (4 diffs)

trunk/src/buzelib/MainFrm.cpp

@@ -583 +583 @@
 
 LRESULT CMainFrame::OnShowPreferences(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        
         showPreferencesView();
 
-        CPreferencesDialog prefs(this);
-        prefs.DoModal();
+        //CPreferencesDialog prefs(this);
+        //prefs.DoModal();
         return 0;
 }

trunk/src/buzelib/PreferencesView.cpp

@@ -14 +14 @@
         :CViewImpl<CMainFrame, CDocument, CPreferencesView>(mainFrm->document)
 {
+        mainFrame = mainFrm;
         lastPageListItem = -1;
+        provider = 0;
 }
 
@@ -51 +53 @@
         pLoop->AddIdleHandler(this);
 
+        mainFrame->addTabableView(m_hWnd);
+
         return lres;
 }
 
 LRESULT CPreferencesView::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
+    document->removeView(this);
+
+    // denne fixet crash når vi lukker hele clienten
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
 
         CMessageLoop* pLoop = _Module.GetMessageLoop();
@@ -92 +100 @@
 
 LRESULT CPreferencesView::OnApplyClicked(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        MessageBox("Apply!");
+        provider->doDataExchange(true);
         return 0;
 }

trunk/src/buzelib/PreferencesViewProperties.cpp

@@ -101 +101 @@
                         inDeviceIndex = 0; else
                         inDeviceIndex = (i - names.begin()) + 1;
+                dirty = false;
         } else {
 
-                //zzub::audiodevice* device = out_devices[outDeviceIndex];
-                //rate = device->rates[rateIndex];
-
-                //mainFrame->configuration->setAudioDriver(outDevice, inDevice, rate, size, outch);
+                zzub::audiodevice* out_device = out_devices[outDeviceIndex];
+                
+                zzub::audiodevice* in_device = 0;
+                if (inDeviceIndex > 0) in_device = in_devices[inDeviceIndex - 1];
+
+                std::string outDevice = out_device->name;
+                std::string inDevice = "";
+                if (in_device) inDevice = in_device->name;
+                int rate = out_device->rates[rateIndex];
+                int size = standardBufferSizes[bufferSizeIndex];
+
+                _Module.setAudioDriver(outDevice, inDevice, rate, size, outChannelIndex, true);
+                dirty = false;
 
         }
@@ -368 +378 @@
 
                 _Module.configuration->setMidiOutputs(midiIndices);
+                dirty = false;
         }
 }
@@ -488 +499 @@
         COLORREF color = _Module.themes->getThemeColor(name);
         return color;
-        /*std::stringstream strm;
-        strm << "#" << std::hex << std::setw(6) << std::setfill('0') << std::uppercase <<  color;
-        return strm.str();*/
 }
 
@@ -525 +533 @@
         properties.push_back(new StringPropertyInfo<CGuiConfigProvider>(this, "Default Wave Editor", &CGuiConfigProvider::getExternalWaveEditor, &CGuiConfigProvider::setExternalWaveEditor));
 
+        fontIndex = -1;
+        fontSizeIndex = -1;
+        zoomIndex = -1;
 }
 
@@ -540 +551 @@
 }
 
+void CGuiConfigProvider::doDataExchange(bool save) {
+        if (!save) {
+                float scale = (_Module.configuration->getMachineScale() - 0.1f) * 10.0f;
+                zoomIndex = (int)floor(scale + 0.5f);
+                machineSkins = _Module.configuration->getMachineSkinVisibility();
+
+                std::string fontName = "";
+                _Module.configuration->getConfigString("Settings", "FixedWidthFont", &fontName);
+                std::vector<std::string> fonts = getFonts();
+                std::vector<std::string>::iterator i = find(fonts.begin(), fonts.end(), fontName);
+                if (i == fonts.end()) 
+                        fontIndex = 0; else
+                        fontIndex = i - fonts.begin();
+
+                int pointsize = 15;
+                _Module.configuration->getConfigNumber("Settings", "FixedWidthFontSize", (DWORD*)&pointsize);
+                std::string ptstr = stringFromInt(pointsize);
+                std::vector<std::string> sizes = getFontSizes();
+                i = find(sizes.begin(), sizes.end(), ptstr);
+                if (i == sizes.end()) 
+                        fontSizeIndex = 0; else
+                        fontSizeIndex = i - sizes.begin();
+
+                patternLength = _Module.configuration->getGlobalPatternLength();
+
+                seqDark = _Module.configuration->getSequencerStepHigh();
+                seqDarker = _Module.configuration->getSequencerStepLow();
+
+                seqCellWidth = 64;
+                _Module.configuration->getConfigNumber("Settings", "SequenceCellWidth", (DWORD*)&seqCellWidth);
+
+                paramPopup = _Module.configuration->getParameterPopupFlag()?TRUE:FALSE;
+                waveEditor = _Module.configuration->getExternalWaveEditor();
+                dirty = false;
+        } else {
+                _Module.configuration->setMachineScale( (double)zoomIndex / 10 + 0.1);
+                _Module.configuration->setMachineSkinVisibility(machineSkins);
+
+                std::vector<std::string> fonts = getFonts();
+                _Module.configuration->setConfigString("Settings", "FixedWidthFont", fonts[fontIndex]);
+
+                int font = getFont();
+                int pointsize = fixedWidthSizes[font][fontSizeIndex];
+                _Module.configuration->setConfigNumber("Settings", "FixedWidthFontSize", (DWORD)pointsize);
+
+                _Module.configuration->setGlobalPatternLength(patternLength);
+
+                _Module.configuration->setSequencerStepLow(seqDarker);
+                _Module.configuration->setSequencerStepHigh(seqDark);
+
+                _Module.configuration->setConfigNumber("Settings", "SequenceCellWidth", (DWORD)seqCellWidth);
+
+                _Module.configuration->setParameterPopupFlag(paramPopup);
+                _Module.configuration->setExternalWaveEditor(waveEditor);
+                dirty = false;
+
+        }
+}
+
 int CGuiConfigProvider::getZoom() {
-        float scale = (_Module.configuration->getMachineScale() - 0.1f) * 10.0f;
-        return (int)floor(scale + 0.5f);
+        return zoomIndex;
 }
 
 void CGuiConfigProvider::setZoom(int i) {
         dirty = true;
-        _Module.configuration->setMachineScale( (double)i / 10 + 0.1);
+        zoomIndex = i;
 }
 
@@ -563 +632 @@
 
 BOOL CGuiConfigProvider::getMachineSkins() {
-        return _Module.configuration->getMachineSkinVisibility()?FALSE:TRUE;
+        // note we return the opposite result
+        return machineSkins?FALSE:TRUE;
 }
 
 void CGuiConfigProvider::setMachineSkins(BOOL value) {
         dirty = true;
-        _Module.configuration->setMachineSkinVisibility(value!=0?false:true);
+        // note we set the opposite value
+        machineSkins = value?false:true;
 }
 
 int CGuiConfigProvider::getFont() {
-        std::string fontName = "";
-        _Module.configuration->getConfigString("Settings", "FixedWidthFont", &fontName);
-
-        std::vector<std::string> fonts = getFonts();
-        std::vector<std::string>::iterator i = find(fonts.begin(), fonts.end(), fontName);
-        if (i == fonts.end()) return 0;
-
-        return i - fonts.begin();
+        return fontIndex;
 }
 
 void CGuiConfigProvider::setFont(int index) {
         dirty = true;
-        std::vector<std::string> fonts = getFonts();
-        _Module.configuration->setConfigString("Settings", "FixedWidthFont", fonts[index]);
-        
+        fontIndex = index;
         view->BindProvider();
 }
@@ -688 +750 @@
 
 int CGuiConfigProvider::getFontSize() {
-        int pointsize = 15;
-        _Module.configuration->getConfigNumber("Settings", "FixedWidthFontSize", (DWORD*)&pointsize);
-        
-        std::string ptstr = stringFromInt(pointsize);
-        std::vector<std::string> sizes = getFontSizes();
-        std::vector<std::string>::iterator i = find(sizes.begin(), sizes.end(), ptstr);
-        if (i == sizes.end()) return 0;
-        return i - sizes.begin();
+        return fontSizeIndex;
 }
 
 void CGuiConfigProvider::setFontSize(int index) {
         dirty = true;
-        int font = getFont();
-        int pointsize = fixedWidthSizes[font][index];
-        _Module.configuration->setConfigNumber("Settings", "FixedWidthFontSize", (DWORD)pointsize);
+        fontSizeIndex = index;
 }
 
@@ -721 +774 @@
 
 int CGuiConfigProvider::getPatternLength() {
-        return _Module.configuration->getGlobalPatternLength();
+        return patternLength;
 }
 
 void CGuiConfigProvider::setPatternLength(int value) {
         dirty = true;
-        _Module.configuration->setGlobalPatternLength(value);
-        view->BindProvider();
-}
-
+        patternLength = value;
+}
 
 int CGuiConfigProvider::getSequencerDarkRow() {
-        return _Module.configuration->getSequencerStepHigh();
+        return seqDark;
 }
 
 void CGuiConfigProvider::setSequencerDarkRow(int value) {
         dirty = true;
-        _Module.configuration->setSequencerStepHigh(value);
+        seqDark = value;
 }
 
 int CGuiConfigProvider::getSequencerDarkerRow() {
-        return _Module.configuration->getSequencerStepLow();
+        return seqDarker;
 }
 
 void CGuiConfigProvider::setSequencerDarkerRow(int value) {
         dirty = true;
-        _Module.configuration->setSequencerStepLow(value);
+        seqDarker = value;
 }
 
 int CGuiConfigProvider::getSequencerCellWidth() {
-        int cellWidth = 64;
-        _Module.configuration->getConfigNumber("Settings", "SequenceCellWidth", (DWORD*)&cellWidth);
-        return cellWidth;
+        return seqCellWidth;
 }
 
 void CGuiConfigProvider::setSequencerCellWidth(int cellWidth) {
         dirty = true;
-        _Module.configuration->setConfigNumber("Settings", "SequenceCellWidth", (DWORD)cellWidth);
+        seqCellWidth = cellWidth;
 }
 
 BOOL CGuiConfigProvider::getParameterPopup() {
-        return _Module.configuration->getParameterPopupFlag()?TRUE:FALSE;
+        return paramPopup?TRUE:FALSE;
 }
 
 void CGuiConfigProvider::setParameterPopup(BOOL value) {
         dirty = true;
-        _Module.configuration->setParameterPopupFlag(value!=0?true:false);
+        paramPopup = value?true:false;
 }
 
 std::string CGuiConfigProvider::getExternalWaveEditor() {
-        return _Module.configuration->getExternalWaveEditor();
+        return waveEditor;
 }
 
 void CGuiConfigProvider::setExternalWaveEditor(std::string value) {
         dirty = true;
-        _Module.configuration->setExternalWaveEditor(value);
+        waveEditor = value;
 }
 

trunk/src/buzelib/PreferencesViewProperties.h

@@ -28 +28 @@
     std::vector<PropertyInfoBase*> properties;
 
-//      std::string outDevice, inDevice;
         int outDeviceIndex, inDeviceIndex;
         int rateIndex, bufferSizeIndex, outChannelIndex;
-//      int rate, size, outch;
 
         std::vector<zzub::audiodevice*> out_devices;
@@ -118 +116 @@
         CThemeConfigProvider* provider;
         std::string name;
+        COLORREF value;
 
         void setValue(COLORREF value);
         COLORREF getValue();
-//      void setValue(std::string value);
-//      std::string getValue();
 };
 
@@ -158 +155 @@
         CMainFrame* mainFrame;
     std::vector<PropertyInfoBase*> properties;
+        int zoomIndex, fontIndex, fontSizeIndex, patternLength, seqDark, seqDarker, seqCellWidth;
+        bool machineSkins, paramPopup;
+        std::string waveEditor;
 
         CGuiConfigProvider(CPropertyView* view, CMainFrame* mainFrame);
@@ -163 +163 @@
         virtual PropertyInfoBase* getProperty(int index);
         virtual bool isData(void* data);
-        virtual void doDataExchange(bool save) {}
+        virtual void doDataExchange(bool save);
 
         std::string getGui() { return "..."; }