Zoom Toggle

Added preferences for Zoom-Toggle and put into menus.
New helper functions for determining zoom scaling.

Optional EXPERIMENTAL_ZOOM_TOGGLE_BUTTON added, and Light theme updated.
Not enabled for 2.2.2.

src/toolbars/EditToolBar.cpp

@@ -160,6 +160,11 @@ void EditToolBar::Populate()
    AddButton(bmpZoomOut, bmpZoomOut, bmpZoomOutDisabled, ETBZoomOutID,
       _("Zoom Out"));
 
+#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
+   AddButton(bmpZoomToggle, bmpZoomToggle, bmpZoomToggleDisabled, ETBZoomToggleID,
+      _("Zoom Toggle"));
+#endif
+
    AddButton(bmpZoomSel, bmpZoomSel, bmpZoomSelDisabled, ETBZoomSelID,
       _("Fit selection in window"));
    AddButton(bmpZoomFit, bmpZoomFit, bmpZoomFitDisabled, ETBZoomFitID,
@@ -167,6 +172,9 @@ void EditToolBar::Populate()
 
    mButtons[ETBZoomInID]->SetEnabled(false);
    mButtons[ETBZoomOutID]->SetEnabled(false);
+#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
+   mButtons[ETBZoomToggleID]->SetEnabled(false);
+#endif
 
    mButtons[ETBZoomSelID]->SetEnabled(false);
    mButtons[ETBZoomFitID]->SetEnabled(false);
@@ -226,6 +234,9 @@ static const struct Entry {
 
    { ETBZoomInID,   wxT("ZoomIn"),      XO("Zoom In")  },
    { ETBZoomOutID,  wxT("ZoomOut"),     XO("Zoom Out")  },
+#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
+   { ETBZoomToggleID,   wxT("ZoomToggle"),      XO("Zoom Toggle")  },
+#endif 
    { ETBZoomSelID,  wxT("ZoomSel"),     XO("Fit selection in window")  },
    { ETBZoomFitID,  wxT("FitInWindow"), XO("Fit project in window")  },
 

src/toolbars/EditToolBar.h

@@ -48,10 +48,9 @@ enum {
 
    ETBZoomInID,
    ETBZoomOutID,
-
-   #if 0 // Disabled for version 1.2.0 since it doesn't work quite right...
+#ifdef EXPERIMENTAL_ZOOM_TOGGLE_BUTTON
    ETBZoomToggleID,
-   #endif
+#endif
 
    ETBZoomSelID,
    ETBZoomFitID,