made prefs restart radiant popup centered with fancy icon

This commit is contained in:
freemancw 2012-12-17 02:35:45 -05:00
parent 05e48b2d4e
commit db442af134

View file

@ -4559,45 +4559,51 @@ void MainFrame::OnEditSaveprefab(){
} }
} }
void MainFrame::OnPrefs(){ void MainFrame::OnPrefs() {
int nView = g_PrefsDlg.m_nView; int nView = g_PrefsDlg.m_nView;
bool bToolbar = g_PrefsDlg.m_bWideToolbar; int nShader = g_PrefsDlg.m_nShader;
bool bPluginToolbar = g_PrefsDlg.m_bPluginToolbar; int nTextureQuality = g_PrefsDlg.m_nTextureQuality;
int nShader = g_PrefsDlg.m_nShader; bool bToolbar = g_PrefsDlg.m_bWideToolbar;
int nTextureQuality = g_PrefsDlg.m_nTextureQuality; bool bPluginToolbar = g_PrefsDlg.m_bPluginToolbar;
// int nLightRadiuses = g_PrefsDlg.m_nLightRadiuses; bool bDetachableMenus = g_PrefsDlg.m_bDetachableMenus;
g_PrefsDlg.LoadPrefs(); bool bFloatingZ = g_PrefsDlg.m_bFloatingZ;
if ( g_PrefsDlg.DoModal() == IDOK ) { g_PrefsDlg.LoadPrefs();
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." ) );
}
// if the view mode was switched to floating, set the Z window on by default if(g_PrefsDlg.DoModal() == IDOK) {
// this was originally intended as a bug fix, but the fix is elsewhere .. anyway making sure we force Z on each time is good if((g_PrefsDlg.m_nLatchedView != nView ) ||
// (and we simply hope there will be a SavePrefs before we die) (g_PrefsDlg.m_bLatchedDetachableMenus != bDetachableMenus ) ||
if ( ( g_PrefsDlg.m_nView != nView ) && ( (EViewStyle)g_PrefsDlg.m_nView == (EViewStyle)eFloating ) ) { (g_PrefsDlg.m_bLatchedWideToolbar != bToolbar ) ||
g_PrefsDlg.m_bZVis = true; (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 ) { // if the view mode was switched to floating, set the Z window on by
m_pTexWnd->UpdatePrefs(); // 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" ) ); if(m_pTexWnd) {
g_bIgnoreCommands++; m_pTexWnd->UpdatePrefs();
gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM( item ), }
( g_PrefsDlg.m_bSnap ) ? TRUE : FALSE );
g_bIgnoreCommands--; 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(){ void MainFrame::OnTogglecamera(){