Changeset 1290

Timestamp:

10/21/07 19:10:28 (11 months ago)

Author:

calvin

Message:

zoners patches: float views save positions correctly, disable machine skins in registry. fix bug where menu would disappear if the status bar was hidden, removed unnecessary messages

Location:

trunk/src/buzelib

Files:

• BuzeConfiguration.cpp (modified) (1 diff)
• BuzeConfiguration.h (modified) (1 diff)
• DockTabFrame/DockTabSerializer.cpp (modified) (3 diffs)
• DockTabFrame/DockTabSerializer.h (modified) (2 diffs)
• MainFrm.cpp (modified) (3 diffs)
• PatternView.cpp (modified) (1 diff)

trunk/src/buzelib/BuzeConfiguration.cpp

@@ -267 +267 @@
         return dw;
 }
+
+void CConfiguration::setMachineSkinVisibility(std::string uri, bool state) {
+        setConfigNumber("Settings", "MachineSkin", state?1:0);
+}
+
+bool CConfiguration::getMachineSkinVisibility(std::string uri) {
+        DWORD dw = 1;
+        getConfigNumber("Settings", "MachineSkin", &dw);
+        return dw;
+}

trunk/src/buzelib/BuzeConfiguration.h

@@ -48 +48 @@
         void setMachinePatternLength(std::string uri, int length);
         int getMachinePatternLength(std::string uri);
+
+        void setMachineSkinVisibility(std::string uri, bool state);
+        bool getMachineSkinVisibility(std::string uri);
 };

trunk/src/buzelib/DockTabFrame/DockTabSerializer.cpp

@@ -144 +144 @@
 }
 
-int DockTabSerializer::serializeSplitPane(DockSplitTab::Frame* frame, xml_node& parent, SplitPane* pane) {
+int DockTabSerializer::serializeSplitPane(DockSplitTab::Frame* frame, xml_node& parent, SplitPane* pane, RECT *rc) {
     int counter = 0;
 
-    RECT rc;
-    GetClientRect(pane->m_hWnd, &rc);
-    parent.append_attribute("width", rc.right - rc.left);
-    parent.append_attribute("height", rc.bottom - rc.top);
+    parent.append_attribute("width", rc->right - rc->left);
+    parent.append_attribute("height", rc->bottom - rc->top);
 
     HWND rootSplitterWnd = findRootSplitter(pane);
@@ -180 +178 @@
 
     return counter;
+}
+
+
+int DockTabSerializer::serializeSplitPane(DockSplitTab::Frame* frame, xml_node& parent, SplitPane* pane) {
+    int counter = 0;
+
+    RECT rc;
+
+    GetClientRect(pane->m_hWnd, &rc);
+    return serializeSplitPane(frame, parent, pane, &rc);
 }
 
@@ -244 +252 @@
             dock.name("float");
             RECT rc;
-            ::GetWindowRect(pane->m_hWnd, &rc);
+                        floatFrame->GetWindowRect(&rc);
             dock.append_attribute("x", rc.left);
             dock.append_attribute("y", rc.top);
-            wc += serializeSplitPane(frame, dock, pane);
+                        
+            wc += serializeSplitPane(frame, dock, pane, &rc);
 
             continue;

trunk/src/buzelib/DockTabFrame/DockTabSerializer.h

@@ -46 +46 @@
     int serializeSplitterPaneViews(DockSplitTab::Frame* frame, pug::xml_node& parent, DockSplitTab::SplitPane* pane, HWND hWnd);
     bool splitterPaneRootFilter(DockSplitTab::SplitPane* pane, HWND paneWnd, std::map<HWND, bool>& allSplitters);
+        
 
     template <class T>
@@ -64 +65 @@
     HWND findRootSplitter(DockSplitTab::SplitPane* pane);
     int serializeSplitPane(DockSplitTab::Frame* frame, pug::xml_node& parent, DockSplitTab::SplitPane* pane);
+        int serializeSplitPane(DockSplitTab::Frame* frame, pug::xml_node& parent, DockSplitTab::SplitPane* pane, RECT *rc);
 
 // deserializer

trunk/src/buzelib/MainFrm.cpp

@@ -1210 +1210 @@
         UIAddToolBar(hWndViews);
 
-        setMainFrameToolbarVisibility(0, ID_VIEW_STATUS_BAR, getToolbarVisibility(ID_VIEW_STATUS_BAR), FALSE, FALSE);
+        ::ShowWindow(m_hWndStatusBar, getToolbarVisibility(ID_VIEW_STATUS_BAR) ? SW_SHOWNOACTIVATE : SW_HIDE);
+
         setMainFrameToolbarVisibility(1, ID_VIEW_TOOLBAR, getToolbarVisibility(ID_VIEW_TOOLBAR), FALSE, FALSE);
+        setMainFrameToolbarVisibility(2, ID_VIEW_VIEWS, getToolbarVisibility(ID_VIEW_VIEWS), FALSE, FALSE);
         setMainFrameToolbarVisibility(3, ID_VIEW_TRANSPORTTOOLBAR, getToolbarVisibility(ID_VIEW_TRANSPORTTOOLBAR), FALSE, FALSE);
+        setMainFrameToolbarVisibility(4, ID_VIEW_TIMETOOLBAR, getToolbarVisibility(ID_VIEW_TIMETOOLBAR), FALSE, FALSE);
         setMainFrameToolbarVisibility(5, ID_VIEW_MASTERTOOLBAR, getToolbarVisibility(ID_VIEW_MASTERTOOLBAR), FALSE, FALSE);
-        setMainFrameToolbarVisibility(4, ID_VIEW_TIMETOOLBAR, getToolbarVisibility(ID_VIEW_TIMETOOLBAR), FALSE, FALSE);
-        setMainFrameToolbarVisibility(2, ID_VIEW_VIEWS, getToolbarVisibility(ID_VIEW_VIEWS), FALSE, FALSE);
 
         setPatternToolbarVisibility(0, ID_PATTERNVIEW_WAVETOOLTOOLBAR, getToolbarVisibility(ID_PATTERNVIEW_WAVETOOLTOOLBAR), FALSE, FALSE);
@@ -2620 +2621 @@
 
 MachineSkin* CMainFrame::getSkin(std::string uri) {
+        if (!_Module.configuration->getMachineSkinVisibility(uri)) return 0; // Skin visibility setting
+
         map<string, MachineSkin>::iterator i = skins.find(uri);
         if ( i == skins.end()) return 0;
@@ -2651 +2654 @@
 
 LRESULT CMainFrame::OnDropFiles(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) {
-        MessageBox("Dropped file");
+        //MessageBox("Dropped file");
         // this oen works right away but is considered deprecated in windows
         return 0;

trunk/src/buzelib/PatternView.cpp

@@ -1884 +1884 @@
 LRESULT CPatternView::OnSetStepRange(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
         int step = wID - ID_EDIT_STEP_0;
-
-        MessageBox("HAHA", stringFromInt(step, 0, ' ').c_str());
         if (step < 0 || step > 9) return 0;
         patternEditor.editor.step = step;