From: Thomas Debesse Date: Sun, 14 Jul 2019 00:57:54 +0000 (+0200) Subject: bikeshedding: some wording X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F141%2Fhead;p=xonotic%2Fnetradiant.git bikeshedding: some wording --- diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h index d795b758..e6c5ff6a 100644 --- a/libs/uilib/uilib.h +++ b/libs/uilib/uilib.h @@ -585,7 +585,7 @@ namespace ui { alert_response alert( Window parent, std::string text, - std::string title = "NetRadiant", + std::string title = RADIANT_NAME, alert_type type = alert_type::OK, alert_icon icon = alert_icon::Default ); diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 663ca303..8a7691af 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -816,7 +816,7 @@ void Radiant_Shutdown(){ } void Exit(){ - if ( ConfirmModified( "Exit Radiant" ) ) { + if ( ConfirmModified( "Exit " RADIANT_NAME ) ) { gtk_main_quit(); } } @@ -2935,7 +2935,7 @@ WindowPositionTracker g_posXZWnd; WindowPositionTracker g_posYZWnd; static gint mainframe_delete( ui::Widget widget, GdkEvent *event, gpointer data ){ - if ( ConfirmModified( "Exit Radiant" ) ) { + if ( ConfirmModified( "Exit " RADIANT_NAME ) ) { gtk_main_quit(); } diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 8e2e0268..659308ae 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -881,6 +881,7 @@ void Preferences_Save(){ return; } + // save global preferences g_GamesDialog.SavePrefs(); globalOutputStream() << "saving local preferences to " << g_Preferences.m_inipath->str << "\n"; @@ -912,7 +913,7 @@ void PreferencesDialog_showDialog(){ if ( ConfirmModified( "Edit Preferences" ) && g_Preferences.DoModal() == eIDOK ) { if ( !g_restart_required.empty() ) { StringOutputStream message( 256 ); - message << "Preference changes require a restart:\n"; + message << "Preference changes require a restart:\n\n"; for ( std::vector::iterator i = g_restart_required.begin(); i != g_restart_required.end(); ++i ) {