X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fdialog.cpp;h=c6672ae4c5af9564077f857399b8aa28883b7892;hp=84b2ee2ae50a4c2380a5d8e081b063e15db43111;hb=a9e5bfdf2a458e89978ee52ebbd3711884b54b29;hpb=7a6d52cddfb66e7433405c9835b0995e308011dd

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index 84b2ee2a..c6672ae4 100644
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -48,9 +48,9 @@
 
 
 ui::Entry DialogEntry_new(){
-	auto entry = ui::Entry();
+	auto entry = ui::Entry(ui::New);
 	entry.show();
-	gtk_widget_set_size_request( GTK_WIDGET( entry ), 64, -1 );
+	entry.dimensions(64, -1);
 	return entry;
 }
 
@@ -70,7 +70,7 @@ DialogEntryRow DialogEntryRow_new( const char* name ){
 	auto entry = DialogEntry_new();
 	alignment.add(entry);
 
-	return DialogEntryRow( ui::Widget(GTK_WIDGET( DialogRow_new( name, alignment ) )), entry );
+	return DialogEntryRow( ui::Widget(DialogRow_new( name, alignment  )), entry );
 }
 
 
@@ -83,7 +83,7 @@ ui::SpinButton DialogSpinner_new( double value, double lower, double upper, int
 	}
 	auto spin = ui::SpinButton( ui::Adjustment( value, lower, upper, step, 10, 0 ), step, digits );
 	spin.show();
-	gtk_widget_set_size_request( GTK_WIDGET( spin ), 64, -1 );
+	spin.dimensions(64, -1);
 	return spin;
 }
 
@@ -103,7 +103,7 @@ DialogSpinnerRow DialogSpinnerRow_new( const char* name, double value, double lo
 	auto spin = DialogSpinner_new( value, lower, upper, fraction );
 	alignment.add(spin);
 
-	return DialogSpinnerRow( ui::Widget(GTK_WIDGET( DialogRow_new( name, alignment ) )), spin );
+	return DialogSpinnerRow( ui::Widget(DialogRow_new( name, alignment  )), spin );
 }
 
 
@@ -150,7 +150,7 @@ void IntRadioExport( GtkRadioButton& widget, const IntImportCallback& importCall
 typedef ImportExport<GtkRadioButton, int, IntRadioImport, IntRadioExport> IntRadioImportExport;
 
 void TextEntryImport( GtkEntry& widget, const char* text ){
-	gtk_entry_set_text( &widget, text );
+	ui::Entry(&widget).text(text);
 }
 void TextEntryExport( GtkEntry& widget, const StringImportCallback& importCallback ){
 	importCallback( gtk_entry_get_text( &widget ) );
@@ -319,7 +319,7 @@ void Dialog::ShowDlg(){
 void Dialog::HideDlg(){
 	ASSERT_MESSAGE( m_window, "dialog was not constructed" );
 	exportData();
-	gtk_widget_hide( GTK_WIDGET( m_window ) );
+	m_window.hide();
 }
 
 static gint delete_event_callback( ui::Widget widget, GdkEvent* event, gpointer data ){
@@ -332,13 +332,13 @@ void Dialog::Create(){
 	ASSERT_MESSAGE( !m_window, "dialog cannot be constructed" );
 
 	m_window = BuildDialog();
-	g_signal_connect( G_OBJECT( m_window ), "delete_event", G_CALLBACK( delete_event_callback ), this );
+	m_window.connect( "delete_event", G_CALLBACK( delete_event_callback ), this );
 }
 
 void Dialog::Destroy(){
 	ASSERT_MESSAGE( m_window, "dialog cannot be destroyed" );
 
-	gtk_widget_destroy( GTK_WIDGET( m_window ) );
+	m_window.destroy();
 	m_window = ui::Window{ui::null};
 }
 
@@ -445,7 +445,7 @@ EMessageBoxReturn Dialog::DoModal(){
 		exportData();
 	}
 
-	gtk_widget_hide( GTK_WIDGET( m_window ) );
+	m_window.hide();
 
 	PostModal( m_modal.ret );
 
@@ -453,24 +453,24 @@ EMessageBoxReturn Dialog::DoModal(){
 }
 
 
-ui::CheckButton Dialog::addCheckBox( ui::Widget vbox, const char* name, const char* flag, const BoolImportCallback& importViewer, const BoolExportCallback& exportViewer ){
+ui::CheckButton Dialog::addCheckBox( ui::VBox vbox, const char* name, const char* flag, const BoolImportCallback& importViewer, const BoolExportCallback& exportViewer ){
 	auto check = ui::CheckButton( flag );
 	check.show();
 	AddBoolToggleData( *GTK_TOGGLE_BUTTON( check ), importViewer, exportViewer );
 
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), ui::Widget(GTK_WIDGET( DialogRow_new( name, check ) ) ));
+	DialogVBox_packRow( vbox, ui::Widget(DialogRow_new( name, check  ) ));
 	return check;
 }
 
-ui::CheckButton Dialog::addCheckBox( ui::Widget vbox, const char* name, const char* flag, bool& data ){
+ui::CheckButton Dialog::addCheckBox( ui::VBox vbox, const char* name, const char* flag, bool& data ){
 	return addCheckBox( vbox, name, flag, BoolImportCaller( data ), BoolExportCaller( data ) );
 }
 
-void Dialog::addCombo( ui::Widget vbox, const char* name, StringArrayRange values, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
+void Dialog::addCombo( ui::VBox vbox, const char* name, StringArrayRange values, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
 	auto alignment = ui::Alignment( 0.0, 0.5, 0.0, 0.0 );
 	alignment.show();
 	{
-		auto combo = ui::ComboBoxText();
+		auto combo = ui::ComboBoxText(ui::New);
 
 		for ( StringArrayRange::Iterator i = values.first; i != values.last; ++i )
 		{
@@ -484,28 +484,28 @@ void Dialog::addCombo( ui::Widget vbox, const char* name, StringArrayRange value
 	}
 
 	auto row = DialogRow_new( name, alignment );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX(vbox)), row );
+	DialogVBox_packRow( vbox, row );
 }
 
-void Dialog::addCombo( ui::Widget vbox, const char* name, int& data, StringArrayRange values ){
+void Dialog::addCombo( ui::VBox vbox, const char* name, int& data, StringArrayRange values ){
 	addCombo( vbox, name, values, IntImportCaller( data ), IntExportCaller( data ) );
 }
 
-void Dialog::addSlider( ui::Widget vbox, const char* name, int& data, gboolean draw_value, const char* low, const char* high, double value, double lower, double upper, double step_increment, double page_increment ){
+void Dialog::addSlider( ui::VBox vbox, const char* name, int& data, gboolean draw_value, const char* low, const char* high, double value, double lower, double upper, double step_increment, double page_increment ){
 #if 0
 	if ( draw_value == FALSE ) {
-		ui::Widget hbox2 = ui::HBox( FALSE, 0 );
+		auto hbox2 = ui::HBox( FALSE, 0 );
 		hbox2.show();
-		gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox2 ), FALSE, FALSE, 0 );
+		vbox.pack_start( hbox2 , FALSE, FALSE, 0 );
 		{
 			ui::Widget label = ui::Label( low );
 			label.show();
-			gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
+			hbox2.pack_start( label, FALSE, FALSE, 0 );
 		}
 		{
 			ui::Widget label = ui::Label( high );
 			label.show();
-			gtk_box_pack_end( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
+			hbox2.pack_end(label, FALSE, FALSE, 0);
 		}
 	}
 #endif
@@ -527,10 +527,10 @@ void Dialog::addSlider( ui::Widget vbox, const char* name, int& data, gboolean d
 	gtk_scale_set_digits( GTK_SCALE( scale ), 0 );
 
 	auto row = DialogRow_new( name, alignment );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row );
+	DialogVBox_packRow( vbox, row );
 }
 
-void Dialog::addRadio( ui::Widget vbox, const char* name, StringArrayRange names, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
+void Dialog::addRadio( ui::VBox vbox, const char* name, StringArrayRange names, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
 	auto alignment = ui::Alignment( 0.0, 0.5, 0.0, 0.0 );
 	alignment.show();;
 	{
@@ -540,19 +540,19 @@ void Dialog::addRadio( ui::Widget vbox, const char* name, StringArrayRange names
 	}
 
 	auto row = DialogRow_new( name, alignment );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row );
+	DialogVBox_packRow( vbox, row );
 }
 
-void Dialog::addRadio( ui::Widget vbox, const char* name, int& data, StringArrayRange names ){
+void Dialog::addRadio( ui::VBox vbox, const char* name, int& data, StringArrayRange names ){
 	addRadio( vbox, name, names, IntImportCaller( data ), IntExportCaller( data ) );
 }
 
-void Dialog::addRadioIcons( ui::Widget vbox, const char* name, StringArrayRange icons, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
-	ui::Widget table = ui::Table( 2, icons.last - icons.first, FALSE );
-	table.show();;
+void Dialog::addRadioIcons( ui::VBox vbox, const char* name, StringArrayRange icons, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
+    auto table = ui::Table(2, icons.last - icons.first, FALSE);
+    table.show();
 
-	gtk_table_set_row_spacings( GTK_TABLE( table ), 5 );
-	gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
+    gtk_table_set_row_spacings(table, 5);
+    gtk_table_set_col_spacings(table, 5);
 
 	GSList* group = 0;
 	ui::RadioButton radio{ui::null};
@@ -561,79 +561,75 @@ void Dialog::addRadioIcons( ui::Widget vbox, const char* name, StringArrayRange
 		guint pos = static_cast<guint>( icon - icons.first );
 		auto image = new_local_image( *icon );
 		image.show();
-		gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( image ), pos, pos + 1, 0, 1,
-						  (GtkAttachOptions) ( 0 ),
-						  (GtkAttachOptions) ( 0 ), 0, 0 );
+        table.attach(image, {pos, pos + 1, 0, 1}, {0, 0});
 
 		radio = ui::RadioButton(GTK_RADIO_BUTTON(gtk_radio_button_new( group )));
 		radio.show();
-		gtk_table_attach( GTK_TABLE( table ), radio, pos, pos + 1, 1, 2,
-						  (GtkAttachOptions) ( 0 ),
-						  (GtkAttachOptions) ( 0 ), 0, 0 );
+        table.attach(radio, {pos, pos + 1, 1, 2}, {0, 0});
 
 		group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( radio ) );
 	}
 
 	AddIntRadioData( *GTK_RADIO_BUTTON( radio ), importViewer, exportViewer );
 
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), DialogRow_new( name, table ) );
+	DialogVBox_packRow( vbox, DialogRow_new( name, table ) );
 }
 
-void Dialog::addRadioIcons( ui::Widget vbox, const char* name, int& data, StringArrayRange icons ){
+void Dialog::addRadioIcons( ui::VBox vbox, const char* name, int& data, StringArrayRange icons ){
 	addRadioIcons( vbox, name, icons, IntImportCaller( data ), IntExportCaller( data ) );
 }
 
-ui::Widget Dialog::addIntEntry( ui::Widget vbox, const char* name, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
+ui::Widget Dialog::addIntEntry( ui::VBox vbox, const char* name, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
 	DialogEntryRow row( DialogEntryRow_new( name ) );
 	AddIntEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row );
+	DialogVBox_packRow( vbox, row.m_row );
 	return row.m_row;
 }
 
-ui::Widget Dialog::addSizeEntry( ui::Widget vbox, const char* name, const SizeImportCallback& importViewer, const SizeExportCallback& exportViewer ){
+ui::Widget Dialog::addSizeEntry( ui::VBox vbox, const char* name, const SizeImportCallback& importViewer, const SizeExportCallback& exportViewer ){
 	DialogEntryRow row( DialogEntryRow_new( name ) );
 	AddSizeEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row );
+	DialogVBox_packRow( vbox, row.m_row );
 	return row.m_row;
 }
 
-ui::Widget Dialog::addFloatEntry( ui::Widget vbox, const char* name, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){
+ui::Widget Dialog::addFloatEntry( ui::VBox vbox, const char* name, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){
 	DialogEntryRow row( DialogEntryRow_new( name ) );
 	AddFloatEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row );
+	DialogVBox_packRow( vbox, row.m_row );
 	return row.m_row;
 }
 
-ui::Widget Dialog::addPathEntry( ui::Widget vbox, const char* name, bool browse_directory, const StringImportCallback& importViewer, const StringExportCallback& exportViewer ){
+ui::Widget Dialog::addPathEntry( ui::VBox vbox, const char* name, bool browse_directory, const StringImportCallback& importViewer, const StringExportCallback& exportViewer ){
 	PathEntry pathEntry = PathEntry_new();
-	g_signal_connect( G_OBJECT( pathEntry.m_button ), "clicked", G_CALLBACK( browse_directory ? button_clicked_entry_browse_directory : button_clicked_entry_browse_file ), pathEntry.m_entry );
+	pathEntry.m_button.connect( "clicked", G_CALLBACK( browse_directory ? button_clicked_entry_browse_directory : button_clicked_entry_browse_file ), pathEntry.m_entry );
 
 	AddTextEntryData( *GTK_ENTRY(pathEntry.m_entry), importViewer, exportViewer );
 
-	auto row = DialogRow_new( name, ui::Widget(GTK_WIDGET( pathEntry.m_frame )) );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row );
+	auto row = DialogRow_new( name, ui::Widget(pathEntry.m_frame ) );
+	DialogVBox_packRow( vbox, row );
 
-	return ui::Widget(GTK_WIDGET( row ));
+	return ui::Widget(row );
 }
 
-ui::Widget Dialog::addPathEntry( ui::Widget vbox, const char* name, CopiedString& data, bool browse_directory ){
+ui::Widget Dialog::addPathEntry( ui::VBox vbox, const char* name, CopiedString& data, bool browse_directory ){
 	return addPathEntry( vbox, name, browse_directory, StringImportCallback( StringImportCaller( data ) ), StringExportCallback( StringExportCaller( data ) ) );
 }
 
-ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, double value, double lower, double upper, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
+ui::SpinButton Dialog::addSpinner( ui::VBox vbox, const char* name, double value, double lower, double upper, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
 	DialogSpinnerRow row( DialogSpinnerRow_new( name, value, lower, upper, 1 ) );
 	AddIntSpinnerData( *GTK_SPIN_BUTTON(row.m_spin), importViewer, exportViewer );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row );
+	DialogVBox_packRow( vbox, row.m_row );
 	return ui::SpinButton(row.m_spin);
 }
 
-ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, int& data, double value, double lower, double upper ){
+ui::SpinButton Dialog::addSpinner( ui::VBox vbox, const char* name, int& data, double value, double lower, double upper ){
 	return addSpinner( vbox, name, value, lower, upper, IntImportCallback( IntImportCaller( data ) ), IntExportCallback( IntExportCaller( data ) ) );
 }
 
-ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, double value, double lower, double upper, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){
+ui::SpinButton Dialog::addSpinner( ui::VBox vbox, const char* name, double value, double lower, double upper, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){
 	DialogSpinnerRow row( DialogSpinnerRow_new( name, value, lower, upper, 10 ) );
 	AddFloatSpinnerData( *GTK_SPIN_BUTTON(row.m_spin), importViewer, exportViewer );
-	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row );
+	DialogVBox_packRow( vbox, row.m_row );
 	return ui::SpinButton(row.m_spin);
 }