GUI: Some changes, small bugfixes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4144 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/Frame.cpp

@@ -229,13 +229,16 @@ EVT_MENU(IDM_CONFIG_DSP_PLUGIN, CFrame::OnPluginDSP)
 EVT_MENU(IDM_CONFIG_PAD_PLUGIN, CFrame::OnPluginPAD)
 EVT_MENU(IDM_CONFIG_WIIMOTE_PLUGIN, CFrame::OnPluginWiimote)
 
-EVT_AUITOOLBAR_TOOL_DROPDOWN(IDM_SAVE_PERSPECTIVE, CFrame::OnDropDownToolbarItem)
 EVT_MENU(IDM_SAVE_PERSPECTIVE, CFrame::OnToolBar)
-EVT_MENU(IDM_ADD_PERSPECTIVE, CFrame::OnCreatePerspective)
+EVT_AUITOOLBAR_TOOL_DROPDOWN(IDM_SAVE_PERSPECTIVE, CFrame::OnDropDownToolbarItem)
-EVT_MENU(IDM_PERSPECTIVES_ADD_PANE, CFrame::OnToolBar)
 EVT_MENU(IDM_EDIT_PERSPECTIVES, CFrame::OnToolBar)
-EVT_MENU(IDM_TAB_SPLIT, CFrame::OnToolBar)
+EVT_AUITOOLBAR_TOOL_DROPDOWN(IDM_EDIT_PERSPECTIVES, CFrame::OnDropDownSettingsToolbar)
+// Drop down
+EVT_MENU(IDM_PERSPECTIVES_ADD_PANE, CFrame::OnToolBar)
 EVT_MENU_RANGE(IDM_PERSPECTIVES_0, IDM_PERSPECTIVES_100, CFrame::OnSelectPerspective)
+EVT_MENU(IDM_ADD_PERSPECTIVE, CFrame::OnDropDownToolbarSelect)
+EVT_MENU(IDM_TAB_SPLIT, CFrame::OnDropDownToolbarSelect)
+EVT_MENU(IDM_FLOATABLE_PANES, CFrame::OnDropDownToolbarSelect)
 
 #if defined(HAVE_SFML) && HAVE_SFML
 EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
@@ -308,10 +311,10 @@ CFrame::CFrame(wxFrame* parent,
 		bool ShowLogWindow,
 		long style)
 	: wxFrame(parent, id, title, pos, size, style)	
-	, m_pStatusBar(NULL), bRenderToMain(true), HaveLeds(false)
+	, m_GameListCtrl(NULL), m_pStatusBar(NULL)
-	, HaveSpeakers(false), m_ToolBar(NULL), m_ToolBarDebug(NULL)
+	, m_LogWindow(NULL), m_Panel(NULL), m_ToolBar(NULL), m_ToolBarDebug(NULL)
-	, UseDebugger(_UseDebugger), m_GameListCtrl(NULL), m_Panel(NULL), m_LogWindow(NULL) 
+	, m_bEdit(false), m_bTabSplit(false), m_bFloatPane(false), bRenderToMain(true), HaveLeds(false), HaveSpeakers(false)
-	, m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0)
+	, UseDebugger(_UseDebugger), m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0)
 	#if wxUSE_TIMER
 		, m_timer(this)
 	#endif
@@ -321,7 +324,7 @@ CFrame::CFrame(wxFrame* parent,
 
 	// Give it a console early to show potential messages from this onward
 	ConsoleListener *Console = LogManager::GetInstance()->getConsoleListener();
-	if (SConfig::GetInstance().m_InterfaceConsole) Console->Open(true);
+	if (SConfig::GetInstance().m_InterfaceConsole) Console->Open();
 
 	// Start debugging mazimized
 	if (UseDebugger) this->Maximize(true);
@@ -369,11 +372,10 @@ CFrame::CFrame(wxFrame* parent,
 	m_Panel->SetSizer(sizerPanel);
 	// ---------------
 
-	m_Mgr = new wxAuiManager();
+	// Manager
-	m_Mgr->SetManagedWindow(this);
+	m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
-
+	NOTEBOOK_STYLE = wxAUI_NB_TOP | wxAUI_NB_TAB_EXTERNAL_MOVE | wxAUI_NB_SCROLL_BUTTONS | wxAUI_NB_WINDOWLIST_BUTTON | wxNO_BORDER;
-
+	TOOLBAR_STYLE = wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_TEXT | wxAUI_TB_OVERFLOW /*overflow visible*/;
-	DefaultNBStyle = wxAUI_NB_TOP | wxAUI_NB_SCROLL_BUTTONS | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
 	wxBitmap aNormalFile = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16));
 
 	if (UseDebugger)
@@ -803,7 +805,7 @@ wxPanel* CFrame::CreateEmptyPanel()
 }
 wxAuiNotebook* CFrame::CreateEmptyNotebook()
 {	
-   wxAuiNotebook* NB = new wxAuiNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, DefaultNBStyle);
+   wxAuiNotebook* NB = new wxAuiNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, NOTEBOOK_STYLE);
    return NB;
 }
 

Source/Core/DolphinWX/Src/Frame.h

@@ -100,7 +100,7 @@ class CFrame : public wxFrame
 		// AUI
 		wxAuiManager *m_Mgr;
 		wxAuiToolBar *m_ToolBar, *m_ToolBarDebug, *m_ToolBarAui;
-		int DefaultNBStyle;
+		long NOTEBOOK_STYLE, TOOLBAR_STYLE;
 		int iLeftWidth[2], iMidWidth[2];
 		// Perspectives
 		wxWindow * GetWxWindow(wxString);
@@ -127,7 +127,8 @@ class CFrame : public wxFrame
 		void HidePane();
 		void SetSimplePaneSize();
 		void SetPaneSize();
-		void TogglePaneStyle(bool);
+		void ResetToolbarStyle();
+		void TogglePaneStyle(bool,int);
 		void ToggleNotebookStyle(long);
 		void ResizeConsole();
 		// User perspectives
@@ -151,13 +152,17 @@ class CFrame : public wxFrame
 		void OnPaneClose(wxAuiManagerEvent& evt);
 		void ReloadPanes();
 		void DoLoadPerspective();
-		void OnCreatePerspective(wxCommandEvent& event);
+		void OnDropDownToolbarSelect(wxCommandEvent& event);		
+		void OnDropDownSettingsToolbar(wxAuiToolBarEvent& event);
 		void OnDropDownToolbarItem(wxAuiToolBarEvent& event);
 		void OnSelectPerspective(wxCommandEvent& event);		
 
 	private:
 		
 		bool UseDebugger;
+		bool m_bEdit;
+		bool m_bTabSplit;
+		bool m_bFloatPane;
 		wxBoxSizer* sizerPanel;
 		wxBoxSizer* sizerFrame;
 		CGameListCtrl* m_GameListCtrl;
@@ -210,6 +215,7 @@ class CFrame : public wxFrame
 		void PopulateToolbarAui(wxAuiToolBar* toolBar);
 		void RecreateToolbar();
 		void CreateMenu();
+		void ClearStatusBar();
 		wxPanel *CreateEmptyPanel();
 		wxAuiNotebook *CreateEmptyNotebook();
 
@@ -221,6 +227,7 @@ class CFrame : public wxFrame
 		void OnQuit(wxCommandEvent& event);
 		void OnHelp(wxCommandEvent& event);
 		void OnToolBar(wxCommandEvent& event);
+		void OnAuiToolBar(wxAuiToolBarEvent& event);
 
 		void OnOpen(wxCommandEvent& event); // File menu
 		void DoOpen(bool Boot);

Source/Core/DolphinWX/Src/FrameAui.cpp

@@ -515,67 +515,61 @@ void CFrame::DoRemovePage(wxWindow * Win, bool Hide)
 		if (Hide) Win->Hide();
 	}
 }
-
-// Enable and disable the toolbar
-void CFrame::OnToggleToolbar(wxCommandEvent& event)
-{
-	SConfig::GetInstance().m_InterfaceToolbar = event.IsChecked();
-	DoToggleToolbar(event.IsChecked());
-}
-void CFrame::DoToggleToolbar(bool Show)
-{
-	if (Show)
-	{
-		m_Mgr->GetPane(wxT("TBMain")).Show();
-		if (UseDebugger) { m_Mgr->GetPane(wxT("TBDebug")).Show(); m_Mgr->GetPane(wxT("TBAui")).Show(); }
-		m_Mgr->Update();
-	}
-	else
-	{
-		m_Mgr->GetPane(wxT("TBMain")).Hide();
-		if (UseDebugger) { m_Mgr->GetPane(wxT("TBDebug")).Hide(); m_Mgr->GetPane(wxT("TBAui")).Hide(); }
-		m_Mgr->Update();
-	}
-}
-
-// Enable and disable the status bar
-void CFrame::OnToggleStatusbar(wxCommandEvent& event)
-{
-	SConfig::GetInstance().m_InterfaceStatusbar = event.IsChecked();
-	if (SConfig::GetInstance().m_InterfaceStatusbar == true)
-		m_pStatusBar->Show();
-	else
-		m_pStatusBar->Hide();
-
-	this->SendSizeEvent();
-}
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
+
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Functions
+// Toolbar
 // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
-void CFrame::OnSelectPerspective(wxCommandEvent& event)
+void CFrame::OnDropDownSettingsToolbar(wxAuiToolBarEvent& event)
 {
-	int _Selection = event.GetId() - IDM_PERSPECTIVES_0;
+	event.Skip();
-	if (Perspectives.size() <= _Selection) _Selection = 0;
+	ClearStatusBar();
-	ActivePerspective = _Selection;
+
-	DoLoadPerspective();
+    if (event.IsDropDownClicked())
+    {
+		wxAuiToolBar* Tb = static_cast<wxAuiToolBar*>(event.GetEventObject());
+		Tb->SetToolSticky(event.GetId(), true);
+
+		// Create the popup menu
+		wxMenu menuPopup;
+
+		wxMenuItem* Item =  new wxMenuItem(&menuPopup, IDM_PERSPECTIVES_ADD_PANE, wxT("Add new pane"));
+		menuPopup.Append(Item);
+		menuPopup.Append(new wxMenuItem(&menuPopup));
+		Item =  new wxMenuItem(&menuPopup, IDM_TAB_SPLIT, wxT("Tab split"), wxT(""), wxITEM_CHECK);
+		menuPopup.Append(Item);
+		if (m_bTabSplit) Item->Check(true);
+		Item = new wxMenuItem(&menuPopup, IDM_FLOATABLE_PANES, wxT("No docking"), wxT(""), wxITEM_CHECK);
+		menuPopup.Append(Item);
+		if (m_bFloatPane) Item->Check(true);
+
+		// Line up our menu with the button
+		wxRect rect = Tb->GetToolRect(event.GetId());
+		wxPoint Pt = Tb->ClientToScreen(rect.GetBottomLeft());
+		Pt = ScreenToClient(Pt);
+		// Show
+		PopupMenu(&menuPopup, Pt);
+		// Make the button un-stuck again
+		if (!m_bEdit) Tb->SetToolSticky(event.GetId(), false);
+    }
 }
 void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event)
 {
 	event.Skip();
+	ClearStatusBar();
 
     if (event.IsDropDownClicked())
     {
         wxAuiToolBar* tb = static_cast<wxAuiToolBar*>(event.GetEventObject());
-
         tb->SetToolSticky(event.GetId(), true);
 
         // create the popup menu
         wxMenu menuPopup;
-        wxMenuItem* m1 =  new wxMenuItem(&menuPopup, IDM_ADD_PERSPECTIVE, wxT("Create new perspective"));
+        wxMenuItem* Item = new wxMenuItem(&menuPopup, IDM_ADD_PERSPECTIVE, wxT("Create new perspective"));
-        menuPopup.Append(m1);
+        menuPopup.Append(Item);
 
 		if (Perspectives.size() > 0)
 		{
@@ -592,26 +586,116 @@ void CFrame::OnDropDownToolbarItem(wxAuiToolBarEvent& event)
         wxRect rect = tb->GetToolRect(event.GetId());
         wxPoint pt = tb->ClientToScreen(rect.GetBottomLeft());
         pt = ScreenToClient(pt);
-
+		// show
         PopupMenu(&menuPopup, pt);
-
         // make sure the button is "un-stuck"
         tb->SetToolSticky(event.GetId(), false);
     }
 }
-void CFrame::OnCreatePerspective(wxCommandEvent& event)
+void CFrame::OnToolBar(wxCommandEvent& event)
 {	
-    wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"), wxT("Create new perspective"));
+	ClearStatusBar();
 
-    dlg.SetValue(wxString::Format(wxT("Perspective %u"), unsigned(Perspectives.size() + 1)));
+	switch (event.GetId())
-    if (dlg.ShowModal() != wxID_OK) return;
+	{
+		case IDM_SAVE_PERSPECTIVE:
+			if (Perspectives.size() == 0)
+			{
+				wxMessageBox(wxT("Please create a perspective before saving"), wxT("Notice"), wxOK, this);
+				return;
+			}
+			Save();
+			if (Perspectives.size() > 0 && ActivePerspective < Perspectives.size())
+				this->GetStatusBar()->SetStatusText(wxString::FromAscii(StringFromFormat(
+				"Saved %s", Perspectives.at(ActivePerspective).Name.c_str()).c_str()), 0);
+			break;
+		case IDM_PERSPECTIVES_ADD_PANE:
+			AddPane();
+			break;
+		case IDM_EDIT_PERSPECTIVES:
+			m_bEdit = !m_bEdit;
+			m_ToolBarAui->SetToolSticky(IDM_EDIT_PERSPECTIVES, m_bEdit);
+			TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES);			
+			break;
+	}
+}
+void CFrame::OnDropDownToolbarSelect(wxCommandEvent& event)
+{
+	ClearStatusBar();
+
+	switch(event.GetId())
+	{
+		case IDM_ADD_PERSPECTIVE:
+			{
+				wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"), wxT("Create new perspective"));
+				wxString DefaultValue = wxString::Format(wxT("Perspective %u"), unsigned(Perspectives.size() + 1));
+				dlg.SetValue(DefaultValue);
+				//if (dlg.ShowModal() != wxID_OK) return;
+				bool DlgOk = false; int Return = 0;
+				while (!DlgOk)
+				{
+					Return = dlg.ShowModal();
+					if (Return == wxID_CANCEL)
+						return;
+					else if (dlg.GetValue().Find(wxT(",")) != -1)
+					{
+						wxMessageBox(wxT("The name can not have the letter ',' in it"), wxT("Notice"), wxOK, this);
+						wxString Str = dlg.GetValue();
+						Str.Replace(wxT(","), wxT(""), true);
+						dlg.SetValue(Str);
+					}
+					else if (dlg.GetValue().IsSameAs(wxT("")))
+					{
+						wxMessageBox(wxT("The name can not be empty"), wxT("Notice"), wxOK, this);
+						dlg.SetValue(DefaultValue);
+					}
+					else
+						DlgOk = true;
+				}
+				//wxID_CANCEL
 
 				SPerspectives Tmp;
 				Tmp.Name = dlg.GetValue().mb_str();
 				Perspectives.push_back(Tmp);
+			}
+			break;
+		case IDM_TAB_SPLIT:
+			 m_bTabSplit = event.IsChecked();
+			ToggleNotebookStyle(wxAUI_NB_TAB_SPLIT);
+			break;
+		case IDM_FLOATABLE_PANES:
+			m_bFloatPane = event.IsChecked();
+			TogglePaneStyle(m_bFloatPane, IDM_FLOATABLE_PANES);
+			break;
+	}
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Functions
+// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+
+void CFrame::ResetToolbarStyle()
+{
+    wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
+    for (int i = 0, Count = AllPanes.GetCount(); i < Count; ++i)
+    {
+        wxAuiPaneInfo& Pane = AllPanes.Item(i);
+        if (Pane.window->IsKindOf(CLASSINFO(wxAuiToolBar)))
+        {
+			//Pane.BestSize(-1, -1);
+			Pane.Show();
+			// Show all of it
+			if (Pane.rect.GetLeft() > this->GetClientSize().GetX() - 50)
+				Pane.Position(this->GetClientSize().GetX() - Pane.window->GetClientSize().GetX());
+        }
+    }
+	m_Mgr->Update();
 }
 
-void CFrame::TogglePaneStyle(bool On)
+void CFrame::TogglePaneStyle(bool On, int EventId)
 {
     wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
     for (int i = 0; i < AllPanes.GetCount(); ++i)
@@ -619,12 +703,33 @@ void CFrame::TogglePaneStyle(bool On)
         wxAuiPaneInfo& Pane = AllPanes.Item(i);
 		if (Pane.window->IsKindOf(CLASSINFO(wxAuiNotebook)))
 		{
-			Pane.CaptionVisible(On);
+			// Default
+			Pane.CloseButton(true);
+			Pane.MaximizeButton(true);
+			Pane.MinimizeButton(true);
+			Pane.PinButton(true);
 			Pane.Show();
+
+			switch(EventId)
+			{
+				case IDM_EDIT_PERSPECTIVES:
+					Pane.CaptionVisible(On);
+					Pane.Movable(On);
+					Pane.Floatable(On);
+					Pane.Dockable(On);					
+					break;
+					/*
+				case IDM_FLOATABLE_PANES:				
+					Pane.Dockable(!On);
+					break;
+					*/
+			}
+			Pane.Dockable(!m_bFloatPane);
 		}
     }
 	m_Mgr->Update();
 }
+
 void CFrame::ToggleNotebookStyle(long Style)
 {
     wxAuiPaneInfoArray& AllPanes = m_Mgr->GetAllPanes();
@@ -639,6 +744,14 @@ void CFrame::ToggleNotebookStyle(long Style)
         }
     }
 }
+void CFrame::OnSelectPerspective(wxCommandEvent& event)
+{
+	int _Selection = event.GetId() - IDM_PERSPECTIVES_0;
+	if (Perspectives.size() <= _Selection) _Selection = 0;
+	ActivePerspective = _Selection;
+	DoLoadPerspective();
+}
+
 void CFrame::ResizeConsole()
 {
 	for (int i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
@@ -857,7 +970,8 @@ void CFrame::ReloadPanes()
 		// Create new panes with notebooks
 		for (int i = 0; i < Perspectives.at(ActivePerspective).Width.size() - 1; i++)
 		{
-			m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo().Hide());
+			m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo().Hide()
+			.CaptionVisible(m_bEdit).Floatable(m_bFloatPane));
 		}
 		HideAllNotebooks(true);
 
@@ -865,6 +979,11 @@ void CFrame::ReloadPanes()
 		NamePanes();
 		// Perspectives
 		m_Mgr->LoadPerspective(Perspectives.at(ActivePerspective).Perspective, false);
+		// Reset toolbars
+		ResetToolbarStyle();
+		// Restore settings
+		TogglePaneStyle(m_bFloatPane, IDM_FLOATABLE_PANES);
+		TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES);
 	}
 	// Create one pane by default
 	else
@@ -922,9 +1041,11 @@ void CFrame::SaveLocal()
 		std::string _Section, _Perspective, _Width, _Height;
 		std::vector<std::string> _SWidth, _SHeight;
 		Tmp.Name = VPerspectives.at(i);		
-		_Section = StringFromFormat("P - %s", Tmp.Name.c_str());
+		// Don't save a blank perspective
-		if (!ini.Exists(_Section.c_str(), "Width")) continue;
+		if (Tmp.Name == "") continue;
+		//if (!ini.Exists(_Section.c_str(), "Width")) continue;
 
+		_Section = StringFromFormat("P - %s", Tmp.Name.c_str());
 		ini.Get(_Section.c_str(), "Perspective", &_Perspective, "");
 		ini.Get(_Section.c_str(), "Width", &_Width, "");
 		ini.Get(_Section.c_str(), "Height", &_Height, "");	
@@ -933,15 +1054,15 @@ void CFrame::SaveLocal()
 
 		SplitString(_Width, ",", _SWidth);
 		SplitString(_Height, ",", _SHeight);
-		for (int i = 0; i < _SWidth.size(); i++)
+		for (int j = 0; j < _SWidth.size(); j++)
 		{
 			int _Tmp;
-			if (TryParseInt(_SWidth.at(0).c_str(), &_Tmp)) Tmp.Width.push_back(_Tmp);				
+			if (TryParseInt(_SWidth.at(j).c_str(), &_Tmp)) Tmp.Width.push_back(_Tmp);				
 		}
-		for (int i = 0; i < _SHeight.size(); i++)
+		for (int j = 0; j < _SHeight.size(); j++)
 		{
 			int _Tmp;
-			if (TryParseInt(_SHeight.at(0).c_str(), &_Tmp)) Tmp.Height.push_back(_Tmp);
+			if (TryParseInt(_SHeight.at(j).c_str(), &_Tmp)) Tmp.Height.push_back(_Tmp);
 		}
 		Perspectives.push_back(Tmp);	
 	}
@@ -952,7 +1073,7 @@ void CFrame::Save()
 	if (ActivePerspective >= Perspectives.size()) ActivePerspective = 0;
 
 	// Turn off edit before saving
-	TogglePaneStyle(false);
+	TogglePaneStyle(false, IDM_EDIT_PERSPECTIVES);
 	// Name panes
 	NamePanes();
 
@@ -1001,11 +1122,11 @@ void CFrame::Save()
 	/*
 	ConsoleListener* Console = LogManager::GetInstance()->getConsoleListener();
 	Console->Log(LogTypes::LCUSTOM, StringFromFormat(
-		"Saved: %s (%i panes, %i NBs)\n",
+		"Saved: %s (%s, %i panes, %i NBs)\n",
-		Perspectives.at(ActivePerspective).Name.c_str(), m_Mgr->GetAllPanes().GetCount(), GetNotebookCount()).c_str());
+		Perspectives.at(ActivePerspective).Name.c_str(), STmp.c_str(), m_Mgr->GetAllPanes().GetCount(), GetNotebookCount()).c_str());
 	*/
 	
-	TogglePaneStyle(m_ToolBarAui->GetToolToggled(IDM_EDIT_PERSPECTIVES)); 
+	TogglePaneStyle(m_bEdit, IDM_EDIT_PERSPECTIVES); 
 }
 
 int CFrame::PercentageToPixels(int Percentage, int Total)
@@ -1033,7 +1154,8 @@ void CFrame::NamePanes()
 }
 void CFrame::AddPane()
 {
-	m_Mgr->AddPane(CreateEmptyNotebook());
+	m_Mgr->AddPane(CreateEmptyNotebook(), wxAuiPaneInfo()
+		.CaptionVisible(m_bEdit).Floatable(m_bFloatPane));
 	NamePanes();
 	AddRemoveBlankPage();
 	m_Mgr->Update();

Source/Core/DolphinWX/Src/FrameTools.cpp

@@ -263,8 +263,11 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
 	ToolBar->AddTool(IDM_CONFIG_DSP_PLUGIN, _T("DSP"),  m_Bitmaps[Toolbar_PluginDSP], _T("DSP settings"));
 	ToolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _T("Pad"),  m_Bitmaps[Toolbar_PluginPAD], _T("Pad settings"));
 	ToolBar->AddTool(IDM_CONFIG_WIIMOTE_PLUGIN, _T("Wiimote"),  m_Bitmaps[Toolbar_Wiimote], _T("Wiimote settings"));
+	if (!UseDebugger)
+	{
 		ToolBar->AddSeparator();
 		ToolBar->AddTool(IDM_HELPABOUT, _T("About"), m_Bitmaps[Toolbar_Help], _T("About Dolphin"));
+	}
 
 	// after adding the buttons to the toolbar, must call Realize() to reflect
 	// the changes
@@ -277,11 +280,10 @@ void CFrame::PopulateToolbarAui(wxAuiToolBar* ToolBar)
 	ToolBar->SetToolBitmapSize(wxSize(w, h));
 
 	ToolBar->AddTool(IDM_SAVE_PERSPECTIVE,	wxT("Save"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Save current perspective"));
-	ToolBar->AddTool(IDM_PERSPECTIVES_ADD_PANE,	wxT("Add"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Add new pane"));
+	ToolBar->AddTool(IDM_EDIT_PERSPECTIVES,	wxT("Edit"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Edit current perspective"));
-	ToolBar->AddTool(IDM_EDIT_PERSPECTIVES,	wxT("Edit"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Edit current perspective"), wxITEM_CHECK);
-	ToolBar->AddTool(IDM_TAB_SPLIT,	wxT("Split"),	g_pCodeWindow->m_Bitmaps[Toolbar_GotoPC], wxT("Tab split"), wxITEM_CHECK);
 
 	ToolBar->SetToolDropDown(IDM_SAVE_PERSPECTIVE, true);
+	ToolBar->SetToolDropDown(IDM_EDIT_PERSPECTIVES, true);	
 
 	ToolBar->Realize();
 }
@@ -290,8 +292,7 @@ void CFrame::PopulateToolbarAui(wxAuiToolBar* ToolBar)
 // Delete and recreate the toolbar
 void CFrame::RecreateToolbar()
 {
-	m_ToolBar = new wxAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize,
+	m_ToolBar = new wxAuiToolBar(this, ID_TOOLBAR, wxDefaultPosition, wxDefaultSize, TOOLBAR_STYLE);
-				wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | wxAUI_TB_TEXT);
 	PopulateToolbar(m_ToolBar);
 	
 	m_Mgr->AddPane(m_ToolBar, wxAuiPaneInfo().
@@ -301,8 +302,7 @@ void CFrame::RecreateToolbar()
 
 	if (UseDebugger)
 	{
-		m_ToolBarDebug = new wxAuiToolBar(this, ID_TOOLBAR_DEBUG, wxDefaultPosition, wxDefaultSize,
+		m_ToolBarDebug = new wxAuiToolBar(this, ID_TOOLBAR_DEBUG, wxDefaultPosition, wxDefaultSize, TOOLBAR_STYLE);
-					wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | wxAUI_TB_TEXT);
 		g_pCodeWindow->PopulateToolbar(m_ToolBarDebug);
 		
 		m_Mgr->AddPane(m_ToolBarDebug, wxAuiPaneInfo().
@@ -310,8 +310,7 @@ void CFrame::RecreateToolbar()
 				ToolbarPane().Top().
 				LeftDockable(false).RightDockable(false).Floatable(false));
 
-		m_ToolBarAui = new wxAuiToolBar(this, ID_TOOLBAR_AUI, wxDefaultPosition, wxDefaultSize,
+		m_ToolBarAui = new wxAuiToolBar(this, ID_TOOLBAR_AUI, wxDefaultPosition, wxDefaultSize, TOOLBAR_STYLE);
-					wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | wxAUI_TB_TEXT);
 		PopulateToolbarAui(m_ToolBarAui);
 		m_Mgr->AddPane(m_ToolBarAui, wxAuiPaneInfo().
 				Name(wxT("TBAui")).Caption(wxT("TBAui")).
@@ -698,28 +697,9 @@ void CFrame::OnHelp(wxCommandEvent& event)
 	}
 }
 
-void CFrame::OnToolBar(wxCommandEvent& event)
+void CFrame::ClearStatusBar()
 {
-	switch (event.GetId())
+	if (this->GetStatusBar()->IsEnabled()) this->GetStatusBar()->SetStatusText(wxT(""),0);
-	{
-		case IDM_SAVE_PERSPECTIVE:
-			if (Perspectives.size() == 0)
-			{
-				wxMessageBox(wxT("Please create a perspective before saving"), wxT("Notice"), wxOK, this);
-				return;
-			}
-			Save();
-			break;
-		case IDM_PERSPECTIVES_ADD_PANE:
-			AddPane();
-			break;
-		case IDM_EDIT_PERSPECTIVES:
-			TogglePaneStyle(m_ToolBarAui->GetToolToggled(IDM_EDIT_PERSPECTIVES));
-			break;
-		case IDM_TAB_SPLIT:
-			ToggleNotebookStyle(wxAUI_NB_TAB_SPLIT);
-			break;
-	}
 }
 
 
@@ -996,4 +976,38 @@ void CFrame::GameListChanged(wxCommandEvent& event)
 		m_GameListCtrl->Update();
 	}
 }
+
+// Enable and disable the toolbar
+void CFrame::OnToggleToolbar(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_InterfaceToolbar = event.IsChecked();
+	DoToggleToolbar(event.IsChecked());
+}
+void CFrame::DoToggleToolbar(bool Show)
+{
+	if (Show)
+	{
+		m_Mgr->GetPane(wxT("TBMain")).Show();
+		if (UseDebugger) { m_Mgr->GetPane(wxT("TBDebug")).Show(); m_Mgr->GetPane(wxT("TBAui")).Show(); }
+		m_Mgr->Update();
+	}
+	else
+	{
+		m_Mgr->GetPane(wxT("TBMain")).Hide();
+		if (UseDebugger) { m_Mgr->GetPane(wxT("TBDebug")).Hide(); m_Mgr->GetPane(wxT("TBAui")).Hide(); }
+		m_Mgr->Update();
+	}
+}
+
+// Enable and disable the status bar
+void CFrame::OnToggleStatusbar(wxCommandEvent& event)
+{
+	SConfig::GetInstance().m_InterfaceStatusbar = event.IsChecked();
+	if (SConfig::GetInstance().m_InterfaceStatusbar == true)
+		m_pStatusBar->Show();
+	else
+		m_pStatusBar->Hide();
+
+	this->SendSizeEvent();
+}
 /////////////////////////////////////////////////////////////////////////////////////////////////////////

Source/Core/DolphinWX/Src/Globals.h

@@ -182,6 +182,7 @@ enum
 	IDM_PERSPECTIVES_ADD_PANE,
 	IDM_EDIT_PERSPECTIVES,
 	IDM_TAB_SPLIT,
+	IDM_FLOATABLE_PANES,
 	IDM_PERSPECTIVES_0,
 	IDM_PERSPECTIVES_100 = IDM_PERSPECTIVES_0 + 100,
 	// --------------------------------------------------------------