X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=radiant%2Fbuild.cpp;h=2ff2b83d8c8b6a0d9dafe9660403033f1a924de9;hb=6998d7a4b8491415a8d01569c58a0e04e5f86dfa;hp=5207d67678e275d2b7dcbc45645017b493005896;hpb=51fa1a72ab2099fab13b429097300ed464c25a9d;p=xonotic%2Fnetradiant.git

diff --git a/radiant/build.cpp b/radiant/build.cpp
index 5207d676..2ff2b83d 100644
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -76,6 +76,25 @@ void setString( const char* string ){
 	m_string = string;
 }
 void evaluate( StringBuffer& output ){
+	// replace ".[ExecutableType]" with "[ExecutableExt]"
+	{
+		StringBuffer output;
+		const char *pattern = ".[ExecutableType]";
+		for ( const char *i = m_string.c_str(); *i != '\0'; ++i )
+		{
+			if ( strncmp( pattern, i, sizeof( pattern ) ) == 0 )
+			{
+				output.push_string("[ExecutableExt]");
+				i += strlen( pattern ) - 1;
+			}
+			else
+			{
+				output.push_back(*i);
+			}
+		}
+		setString(output.c_str());
+	}
+
 	StringBuffer variable;
 	bool in_variable = false;
 	for ( const char* i = m_string.c_str(); *i != '\0'; ++i )
@@ -311,21 +330,12 @@ static bool is_separator( const BuildPair &p ){
 }
 
 
-class BuildPairEqual
-{
-const char* m_name;
-public:
-BuildPairEqual( const char* name ) : m_name( name ){
-}
-bool operator()( const BuildPair& self ) const {
-	return string_equal( self.first.c_str(), m_name );
-}
-};
-
 typedef std::list<BuildPair> Project;
 
 Project::iterator Project_find( Project& project, const char* name ){
-	return std::find_if( project.begin(), project.end(), BuildPairEqual( name ) );
+	return std::find_if(project.begin(), project.end(), [&](const BuildPair &self) {
+		return string_equal(self.first.c_str(), name);
+	});
 }
 
 Project::iterator Project_find( Project& project, std::size_t index ){
@@ -666,7 +676,7 @@ ProjectList( Project& project ) : m_project( project ), m_changed( false ){
 }
 };
 
-gboolean project_cell_edited( GtkCellRendererText* cell, gchar* path_string, gchar* new_text, ProjectList* projectList ){
+gboolean project_cell_edited(ui::CellRendererText cell, gchar* path_string, gchar* new_text, ProjectList* projectList ){
 	Project& project = projectList->m_project;
 
 	auto path = ui::TreePath( path_string );
@@ -708,7 +718,7 @@ gboolean project_key_press( ui::TreeView widget, GdkEventKey* event, ProjectList
 	Project& project = projectList->m_project;
 
 	if ( event->keyval == GDK_KEY_Delete ) {
-		auto selection = ui::TreeSelection(gtk_tree_view_get_selection(widget));
+		auto selection = ui::TreeSelection::from(gtk_tree_view_get_selection(widget));
 		GtkTreeIter iter;
 		GtkTreeModel* model;
 		if ( gtk_tree_selection_get_selected( selection, &model, &iter ) ) {
@@ -766,7 +776,7 @@ gboolean project_selection_changed( ui::TreeSelection selection, ui::ListStore s
 	return FALSE;
 }
 
-gboolean commands_cell_edited( GtkCellRendererText* cell, gchar* path_string, gchar* new_text, ui::ListStore store ){
+gboolean commands_cell_edited(ui::CellRendererText cell, gchar* path_string, gchar* new_text, ui::ListStore store ){
 	if ( g_current_build == 0 ) {
 		return FALSE;
 	}
@@ -832,6 +842,12 @@ gboolean commands_key_press( ui::TreeView widget, GdkEventKey* event, ui::ListSt
 ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectList ){
 	ui::Window window = MainFrame_getWindow().create_dialog_window("Build Menu", G_CALLBACK(dialog_delete_callback ), &modal, -1, 400 );
 
+	// FIXME: GTK_WIN_POS_CENTER_ON_PARENT must be used instead but does not work
+	// for unknown reason.
+	// It's possible MaingFrame_getWindow() does not return the main window.
+	// It's known the preferences window has same issue when using MaingFrame_getWindow().
+	gtk_window_set_position( window, GTK_WIN_POS_CENTER_ALWAYS );
+
 	{
 		auto table1 = create_dialog_table( 2, 2, 4, 4, 4 );
 		window.add(table1);
@@ -847,8 +863,8 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 				vbox.pack_start( button, FALSE, FALSE, 0 );
 			}
 		}
-		auto buildViewStore = ui::ListStore(gtk_list_store_new( 1, G_TYPE_STRING ));
-		auto buildView = ui::TreeView( ui::TreeModel( buildViewStore ));
+		auto buildViewStore = ui::ListStore::from(gtk_list_store_new( 1, G_TYPE_STRING ));
+		auto buildView = ui::TreeView( ui::TreeModel::from( buildViewStore._handle ));
 		{
 			auto frame = create_dialog_frame( "Build menu" );
             table1.attach(frame, {0, 1, 0, 1});
@@ -890,9 +906,9 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 				frame.add(scr);
 
 				{
-					auto store = ui::ListStore(gtk_list_store_new( 1, G_TYPE_STRING ));
+					auto store = ui::ListStore::from(gtk_list_store_new( 1, G_TYPE_STRING ));
 
-					auto view = ui::TreeView(ui::TreeModel( store ));
+					auto view = ui::TreeView(ui::TreeModel::from( store._handle ));
 					gtk_tree_view_set_headers_visible(view, FALSE );
 
 					auto renderer = ui::CellRendererText(ui::New);
@@ -913,7 +929,7 @@ ui::Window BuildMenuDialog_construct( ModalDialog& modal, ProjectList& projectLi
 
 					view.connect( "key_press_event", G_CALLBACK( commands_key_press ), store );
 
-					auto sel = ui::TreeSelection(gtk_tree_view_get_selection(buildView ));
+					auto sel = ui::TreeSelection::from(gtk_tree_view_get_selection(buildView ));
 					sel.connect( "changed", G_CALLBACK( project_selection_changed ), store );
 				}
 			}
@@ -970,7 +986,7 @@ BuildMenuItem( const char* name, ui::MenuItem item )
 void run(){
 	RunBSP( m_name );
 }
-typedef MemberCaller<BuildMenuItem, &BuildMenuItem::run> RunCaller;
+typedef MemberCaller<BuildMenuItem, void(), &BuildMenuItem::run> RunCaller;
 };
 
 typedef std::list<BuildMenuItem> BuildMenuItems;
@@ -1035,7 +1051,7 @@ void SaveBuildMenu(){
 #include "stringio.h"
 
 void BuildMenu_Construct(){
-	GlobalPreferenceSystem().registerPreference( "BuildMenu", CopiedStringImportStringCaller( g_buildMenu ), CopiedStringExportStringCaller( g_buildMenu ) );
+	GlobalPreferenceSystem().registerPreference( "BuildMenu", make_property_string( g_buildMenu ) );
 	LoadBuildMenu();
 }
 void BuildMenu_Destroy(){