From db442af1346400a8ba09eb835d01b9cdfe3c390f Mon Sep 17 00:00:00 2001 From: freemancw Date: Mon, 17 Dec 2012 02:35:45 -0500 Subject: [PATCH] made prefs restart radiant popup centered with fancy icon --- radiant/mainframe.cpp | 76 +++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index c4e46151..21d208b2 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -4559,45 +4559,51 @@ void MainFrame::OnEditSaveprefab(){ } } -void MainFrame::OnPrefs(){ - int nView = g_PrefsDlg.m_nView; - bool bToolbar = g_PrefsDlg.m_bWideToolbar; - bool bPluginToolbar = g_PrefsDlg.m_bPluginToolbar; - int nShader = g_PrefsDlg.m_nShader; - int nTextureQuality = g_PrefsDlg.m_nTextureQuality; -// int nLightRadiuses = g_PrefsDlg.m_nLightRadiuses; - g_PrefsDlg.LoadPrefs(); +void MainFrame::OnPrefs() { + int nView = g_PrefsDlg.m_nView; + int nShader = g_PrefsDlg.m_nShader; + int nTextureQuality = g_PrefsDlg.m_nTextureQuality; + bool bToolbar = g_PrefsDlg.m_bWideToolbar; + bool bPluginToolbar = g_PrefsDlg.m_bPluginToolbar; + bool bDetachableMenus = g_PrefsDlg.m_bDetachableMenus; + bool bFloatingZ = g_PrefsDlg.m_bFloatingZ; - if ( g_PrefsDlg.DoModal() == IDOK ) { - if ( ( g_PrefsDlg.m_nLatchedView != nView ) || - ( g_PrefsDlg.m_bLatchedDetachableMenus != g_PrefsDlg.m_bDetachableMenus ) || - ( g_PrefsDlg.m_bLatchedWideToolbar != bToolbar ) || - ( g_PrefsDlg.m_bLatchedPatchToolbar != bToolbar ) || - ( g_PrefsDlg.m_bLatchedPluginToolbar != bPluginToolbar ) || - ( g_PrefsDlg.m_nLatchedShader != nShader ) || - ( g_PrefsDlg.m_nLatchedTextureQuality != nTextureQuality ) - || ( g_PrefsDlg.m_bLatchedFloatingZ != g_PrefsDlg.m_bFloatingZ ) - ) { - gtk_MessageBox( m_pWidget, _( "You must restart Radiant for the changes to take effect." ) ); - } + g_PrefsDlg.LoadPrefs(); - // if the view mode was switched to floating, set the Z window on by default - // this was originally intended as a bug fix, but the fix is elsewhere .. anyway making sure we force Z on each time is good - // (and we simply hope there will be a SavePrefs before we die) - if ( ( g_PrefsDlg.m_nView != nView ) && ( (EViewStyle)g_PrefsDlg.m_nView == (EViewStyle)eFloating ) ) { - g_PrefsDlg.m_bZVis = true; - } + if(g_PrefsDlg.DoModal() == IDOK) { + if((g_PrefsDlg.m_nLatchedView != nView ) || + (g_PrefsDlg.m_bLatchedDetachableMenus != bDetachableMenus ) || + (g_PrefsDlg.m_bLatchedWideToolbar != bToolbar ) || + (g_PrefsDlg.m_bLatchedPatchToolbar != bToolbar ) || + (g_PrefsDlg.m_bLatchedPluginToolbar != bPluginToolbar ) || + (g_PrefsDlg.m_nLatchedShader != nShader ) || + (g_PrefsDlg.m_nLatchedTextureQuality != nTextureQuality ) || + (g_PrefsDlg.m_bLatchedFloatingZ != bFloatingZ)) { + gtk_MessageBoxNew(m_pWidget, "You must restart Radiant for the " + "changes to take effect.", "Restart Radiant", + MB_OK | MB_ICONINFORMATION); + } - if ( m_pTexWnd ) { - m_pTexWnd->UpdatePrefs(); - } + // if the view mode was switched to floating, set the Z window on by + // default. this was originally intended as a bug fix, but the fix is + // elsewhere .. anyway making sure we force Z on each time is good + // (and we simply hope there will be a SavePrefs before we die) + if((g_PrefsDlg.m_nView != nView) && + ((EViewStyle)g_PrefsDlg.m_nView == (EViewStyle)eFloating)) { + g_PrefsDlg.m_bZVis = true; + } - GtkWidget *item = GTK_WIDGET( g_object_get_data( G_OBJECT( m_pWidget ), "menu_snaptogrid" ) ); - g_bIgnoreCommands++; - gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM( item ), - ( g_PrefsDlg.m_bSnap ) ? TRUE : FALSE ); - g_bIgnoreCommands--; - } + if(m_pTexWnd) { + m_pTexWnd->UpdatePrefs(); + } + + GtkWidget *item = GTK_WIDGET(g_object_get_data(G_OBJECT(m_pWidget), + "menu_snaptogrid")); + g_bIgnoreCommands++; + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), + (g_PrefsDlg.m_bSnap) ? TRUE : FALSE); + g_bIgnoreCommands--; + } } void MainFrame::OnTogglecamera(){