Disable the render/save buttons if no sequence is open. Fixes #42

xLightsSequencer · Feb 26, 2015 · f20c13f · f20c13f
1 parent f4dffee
commit f20c13f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/xLights/TabSequence.cpp b/xLights/TabSequence.cpp
@@ -412,6 +412,12 @@ static void enableAllMenubarControls(wxMenuBar *parent, bool enable) {
 void xLightsFrame::EnableSequenceControls(bool enable)
 {
     enableAllToolbarControls(MainToolBar, enable);
+    if (enable && SeqData.NumFrames() == 0) {
+        //no file is loaded, disable save/render buttons
+        EnableToolbarButton(MainToolBar,ID_AUITOOLBAR_SAVE,false);
+        EnableToolbarButton(MainToolBar,ID_AUITOOLBAR_SAVEAS,false);
+        EnableToolbarButton(MainToolBar,ID_AUITOOLBAR_RENDERALL,false);
+    }
     enableAllToolbarControls(PlayToolBar, enable && SeqData.NumFrames() > 0);
     enableAllToolbarControls(EffectToolBar, enable && SeqData.NumFrames() > 0);
     enableAllToolbarControls(EffectPaletteToolBar, enable && SeqData.NumFrames() > 0);

diff --git a/xLights/wxsmith/xLightsframe.wxs b/xLights/wxsmith/xLightsframe.wxs
@@ -52,7 +52,7 @@
 						<label>Save As</label>
 					</object>
 					<object class="AuiToolBarItem">
-						<object class="wxAuiToolBarItem" name="ID_AUITOOLBARITEM_RenderAll" variable="AuiToolBarItemRenderAll" member="yes">
+						<object class="wxAuiToolBarItem" name="ID_AUITOOLBAR_RENDERALL" variable="AuiToolBarItemRenderAll" member="no">
 							<bitmap code="green_gear_24_xpm" />
 							<shorthelp>Render All</shorthelp>
 							<handler function="OnAuiToolBarItemRenderAllClick" entry="EVT_TOOL" />

diff --git a/xLights/xLightsMain.cpp b/xLights/xLightsMain.cpp
@@ -87,7 +87,7 @@ const long xLightsFrame::ID_AUITOOLBAR_NEWSEQUENCE = wxNewId();
 const long xLightsFrame::ID_AUITOOLBAR_OPEN = wxNewId();
 const long xLightsFrame::ID_AUITOOLBAR_SAVE = wxNewId();
 const long xLightsFrame::ID_AUITOOLBAR_SAVEAS = wxNewId();
-const long xLightsFrame::ID_AUITOOLBARITEM_RenderAll = wxNewId();
+const long xLightsFrame::ID_AUITOOLBAR_RENDERALL = wxNewId();
 const long xLightsFrame::ID_AUITOOLBAR_MAIN = wxNewId();
 const long xLightsFrame::ID_AUITOOLBAR_PLAY_NOW = wxNewId();
 const long xLightsFrame::ID_AUITOOLBAR_PAUSE = wxNewId();
@@ -519,7 +519,7 @@ xLightsFrame::xLightsFrame(wxWindow* parent,wxWindowID id)
     MainToolBar->AddTool(ID_AUITOOLBAR_OPEN, _("Open Sequence"), folder_xpm, wxNullBitmap, wxITEM_NORMAL, _("Open Sequence"), wxEmptyString, NULL);
     MainToolBar->AddTool(ID_AUITOOLBAR_SAVE, _("Save"), save_24_xpm, wxNullBitmap, wxITEM_NORMAL, _("Save"), wxEmptyString, NULL);
     MainToolBar->AddTool(ID_AUITOOLBAR_SAVEAS, _("Save As"), save_as_24_xpm, wxNullBitmap, wxITEM_NORMAL, _("Save As"), wxEmptyString, NULL);
-    MainToolBar->AddTool(ID_AUITOOLBARITEM_RenderAll, _("Render All"), green_gear_24_xpm, wxNullBitmap, wxITEM_NORMAL, _("Render All"), wxEmptyString, NULL);
+    MainToolBar->AddTool(ID_AUITOOLBAR_RENDERALL, _("Render All"), green_gear_24_xpm, wxNullBitmap, wxITEM_NORMAL, _("Render All"), wxEmptyString, NULL);
     MainToolBar->Realize();
     MainAuiManager->AddPane(MainToolBar, wxAuiPaneInfo().Name(_T("Main Tool Bar")).ToolbarPane().Caption(_("Main Tool Bar")).CloseButton(false).Layer(10).Top().Gripper());
     PlayToolBar = new xlAuiToolBar(this, ID_AUITOOLBAR_PLAY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_DEFAULT_STYLE);
@@ -1539,7 +1539,7 @@ xLightsFrame::xLightsFrame(wxWindow* parent,wxWindowID id)
     Connect(ID_AUITOOLBAR_OPEN,wxEVT_COMMAND_TOOL_CLICKED,(wxObjectEventFunction)&xLightsFrame::OnBitmapButtonOpenSeqClick);
     Connect(ID_AUITOOLBAR_SAVE,wxEVT_COMMAND_TOOL_CLICKED,(wxObjectEventFunction)&xLightsFrame::OnBitmapButtonSaveSeqClick);
     Connect(ID_AUITOOLBAR_SAVEAS,wxEVT_COMMAND_TOOL_CLICKED,(wxObjectEventFunction)&xLightsFrame::OnButtonClickSaveAs);
-    Connect(ID_AUITOOLBARITEM_RenderAll,wxEVT_COMMAND_TOOL_CLICKED,(wxObjectEventFunction)&xLightsFrame::OnAuiToolBarItemRenderAllClick);
+    Connect(ID_AUITOOLBAR_RENDERALL,wxEVT_COMMAND_TOOL_CLICKED,(wxObjectEventFunction)&xLightsFrame::OnAuiToolBarItemRenderAllClick);
     Connect(ID_AUITOOLBAR_PLAY_NOW,wxEVT_COMMAND_TOOL_CLICKED,(wxObjectEventFunction)&xLightsFrame::OnAuiToolBarItemPlayButtonClick);
     Connect(ID_AUITOOLBAR_PAUSE,wxEVT_COMMAND_TOOL_CLICKED,(wxObjectEventFunction)&xLightsFrame::OnAuiToolBarItemPauseButtonClick);
     Connect(ID_AUITOOLBAR_STOP,wxEVT_COMMAND_TOOL_CLICKED,(wxObjectEventFunction)&xLightsFrame::OnAuiToolBarItemStopClick);

diff --git a/xLights/xLightsMain.h b/xLights/xLightsMain.h
@@ -655,7 +655,7 @@ class xLightsFrame: public wxFrame
     static const long ID_AUITOOLBAR_OPEN;
     static const long ID_AUITOOLBAR_SAVE;
     static const long ID_AUITOOLBAR_SAVEAS;
-    static const long ID_AUITOOLBARITEM_RenderAll;
+    static const long ID_AUITOOLBAR_RENDERALL;
     static const long ID_AUITOOLBAR_MAIN;
     static const long ID_AUITOOLBAR_PLAY_NOW;
     static const long ID_AUITOOLBAR_PAUSE;