X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fgtkdlgs.cpp;h=f0f3c2749cc4dc87e97edb27079f3f7876af67c5;hp=c3ebca2e7806a705da74195bab46f1ee7ed60938;hb=fed0daaf978788b1c177a72f3195170f17df064b;hpb=465884e260039bad1a333c51b6013edd361a63cd diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index c3ebca2e..f0f3c274 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -35,11 +35,11 @@ // #include "gtkdlgs.h" +#include "globaldefs.h" #include #include "debugging/debugging.h" -#include "version.h" #include "aboutmsg.h" #include "igl.h" @@ -154,8 +154,8 @@ inline void path_copy_clean( char* destination, const char* source ){ struct GameCombo { - ui::ComboBoxText game_select; - GtkEntry* fsgame_entry; + ui::ComboBoxText game_select{ui::null}; + ui::Entry fsgame_entry{ui::null}; }; gboolean OnSelchangeComboWhatgame( ui::Widget widget, GameCombo* combo ){ @@ -168,8 +168,8 @@ gboolean OnSelchangeComboWhatgame( ui::Widget widget, GameCombo* combo ){ gamecombo_t gamecombo = gamecombo_for_gamename( gamename ); - gtk_entry_set_text( combo->fsgame_entry, gamecombo.fs_game ); - gtk_widget_set_sensitive( GTK_WIDGET( combo->fsgame_entry ), gamecombo.sensitive ); + combo->fsgame_entry.text( gamecombo.fs_game ); + gtk_widget_set_sensitive( combo->fsgame_entry , gamecombo.sensitive ); return FALSE; } @@ -198,7 +198,7 @@ class ProjectSettingsDialog { public: GameCombo game_combo; -GtkComboBox* gamemode_combo; +ui::ComboBox gamemode_combo{ui::null}; }; ui::Window ProjectSettingsDialog_construct( ProjectSettingsDialog& dialog, ModalDialog& modal ){ @@ -208,24 +208,20 @@ ui::Window ProjectSettingsDialog_construct( ProjectSettingsDialog& dialog, Modal auto table1 = create_dialog_table( 1, 2, 4, 4, 4 ); window.add(table1); { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_table_attach( table1, GTK_WIDGET( vbox ), 1, 2, 0, 1, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); + auto vbox = create_dialog_vbox( 4 ); + table1.attach(vbox, {1, 2, 0, 1}, {GTK_FILL, GTK_FILL}); { - GtkButton* button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &modal ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &modal ); + vbox.pack_start( button, FALSE, FALSE, 0 ); } { - GtkButton* button = create_dialog_button( "Cancel", G_CALLBACK( dialog_button_cancel ), &modal ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + auto button = create_dialog_button( "Cancel", G_CALLBACK( dialog_button_cancel ), &modal ); + vbox.pack_start( button, FALSE, FALSE, 0 ); } } { auto frame = create_dialog_frame( "Project settings" ); - gtk_table_attach( table1, GTK_WIDGET( frame ), 0, 1, 0, 1, - (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), - (GtkAttachOptions) ( GTK_FILL ), 0, 0 ); + table1.attach(frame, {0, 1, 0, 1}, {GTK_EXPAND | GTK_FILL, GTK_FILL}); { auto table2 = create_dialog_table( ( globalMappingMode().do_mapping_mode ) ? 4 : 3, 2, 4, 4, 4 ); frame.add(table2); @@ -233,13 +229,11 @@ ui::Window ProjectSettingsDialog_construct( ProjectSettingsDialog& dialog, Modal { auto label = ui::Label( "Select mod" ); label.show(); - gtk_table_attach( table2, GTK_WIDGET( label ), 0, 1, 0, 1, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table2.attach(label, {0, 1, 0, 1}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); } { - dialog.game_combo.game_select = ui::ComboBoxText(); + dialog.game_combo.game_select = ui::ComboBoxText(ui::New); gtk_combo_box_text_append_text( dialog.game_combo.game_select, globalGameComboConfiguration().basegame ); if ( globalGameComboConfiguration().known[0] != '\0' ) { @@ -248,9 +242,7 @@ ui::Window ProjectSettingsDialog_construct( ProjectSettingsDialog& dialog, Modal gtk_combo_box_text_append_text( dialog.game_combo.game_select, globalGameComboConfiguration().custom ); dialog.game_combo.game_select.show(); - gtk_table_attach( table2, GTK_WIDGET( dialog.game_combo.game_select ), 1, 2, 0, 1, - (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table2.attach(dialog.game_combo.game_select, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0}); dialog.game_combo.game_select.connect( "changed", G_CALLBACK( OnSelchangeComboWhatgame ), &dialog.game_combo ); } @@ -258,17 +250,13 @@ ui::Window ProjectSettingsDialog_construct( ProjectSettingsDialog& dialog, Modal { auto label = ui::Label( "fs_game" ); label.show(); - gtk_table_attach( table2, GTK_WIDGET( label ), 0, 1, 1, 2, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table2.attach(label, {0, 1, 1, 2}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); } { - auto entry = ui::Entry(); + auto entry = ui::Entry(ui::New); entry.show(); - gtk_table_attach( table2, GTK_WIDGET( entry ), 1, 2, 1, 2, - (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table2.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0}); dialog.game_combo.fsgame_entry = entry; } @@ -276,19 +264,15 @@ ui::Window ProjectSettingsDialog_construct( ProjectSettingsDialog& dialog, Modal if ( globalMappingMode().do_mapping_mode ) { auto label = ui::Label( "Mapping mode" ); label.show(); - gtk_table_attach( table2, GTK_WIDGET( label ), 0, 1, 3, 4, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table2.attach(label, {0, 1, 3, 4}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); - auto combo = ui::ComboBoxText(); + auto combo = ui::ComboBoxText(ui::New); gtk_combo_box_text_append_text( combo, globalMappingMode().sp_mapping_mode ); gtk_combo_box_text_append_text( combo, globalMappingMode().mp_mapping_mode ); combo.show(); - gtk_table_attach( table2, GTK_WIDGET( combo ), 1, 2, 3, 4, - (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table2.attach(combo, {1, 2, 3, 4}, {GTK_EXPAND | GTK_FILL, 0}); dialog.gamemode_combo = combo; } @@ -301,8 +285,8 @@ ui::Window ProjectSettingsDialog_construct( ProjectSettingsDialog& dialog, Modal gamecombo_t gamecombo = gamecombo_for_dir( dir ); gtk_combo_box_set_active( dialog.game_combo.game_select, gamecombo.game ); - gtk_entry_set_text( dialog.game_combo.fsgame_entry, gamecombo.fs_game ); - gtk_widget_set_sensitive( GTK_WIDGET( dialog.game_combo.fsgame_entry ), gamecombo.sensitive ); + dialog.game_combo.fsgame_entry.text( gamecombo.fs_game ); + gtk_widget_set_sensitive( dialog.game_combo.fsgame_entry , gamecombo.sensitive ); if ( globalMappingMode().do_mapping_mode ) { const char *gamemode = gamemode_get(); @@ -359,7 +343,7 @@ void DoProjectSettings(){ ProjectSettingsDialog_ok( dialog ); } - gtk_widget_destroy( GTK_WIDGET( window ) ); + window.destroy(); } } @@ -368,41 +352,40 @@ void DoProjectSettings(){ void DoSides( int type, int axis ){ ModalDialog dialog; - GtkEntry* sides_entry; auto window = MainFrame_getWindow().create_dialog_window("Arbitrary sides", G_CALLBACK(dialog_delete_callback ), &dialog ); - auto accel = ui::AccelGroup(); + auto accel = ui::AccelGroup(ui::New); window.add_accel_group( accel ); + auto sides_entry = ui::Entry(ui::New); { auto hbox = create_dialog_hbox( 4, 4 ); window.add(hbox); { auto label = ui::Label( "Sides:" ); label.show(); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 ); + hbox.pack_start( label, FALSE, FALSE, 0 ); } { - auto entry = ui::Entry(); + auto entry = sides_entry; entry.show(); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( entry ), FALSE, FALSE, 0 ); - sides_entry = entry; - gtk_widget_grab_focus( GTK_WIDGET( entry ) ); + hbox.pack_start( entry, FALSE, FALSE, 0 ); + gtk_widget_grab_focus( entry ); } { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 ); + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, TRUE, TRUE, 0 ); { auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + vbox.pack_start( button, FALSE, FALSE, 0 ); widget_make_default( button ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 ); + gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 ); } { - GtkButton* button = create_dialog_button( "Cancel", G_CALLBACK( dialog_button_cancel ), &dialog ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 ); + auto button = create_dialog_button( "Cancel", G_CALLBACK( dialog_button_cancel ), &dialog ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 ); } } } @@ -413,7 +396,7 @@ void DoSides( int type, int axis ){ Scene_BrushConstructPrefab( GlobalSceneGraph(), (EBrushPrefab)type, atoi( str ), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) ); } - gtk_widget_destroy( GTK_WIDGET( window ) ); + window.destroy(); } // ============================================================================= @@ -431,7 +414,7 @@ void about_button_credits( ui::Widget widget, gpointer data ){ OpenURL( cred.c_str() ); } -void about_button_issues( GtkWidget *widget, gpointer data ){ +void about_button_issues( ui::Widget widget, gpointer data ){ StringOutputStream cred( 256 ); cred << "https://gitlab.com/xonotic/netradiant/issues"; OpenURL( cred.c_str() ); @@ -441,22 +424,22 @@ void DoAbout(){ ModalDialog dialog; ModalDialogButton ok_button( dialog, eIDOK ); - auto window = MainFrame_getWindow().create_modal_dialog_window("About NetRadiant", dialog ); + auto window = MainFrame_getWindow().create_modal_dialog_window("About " RADIANT_NAME, dialog ); { auto vbox = create_dialog_vbox( 4, 4 ); window.add(vbox); { - GtkHBox* hbox = create_dialog_hbox( 4 ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox ), FALSE, TRUE, 0 ); + auto hbox = create_dialog_hbox( 4 ); + vbox.pack_start( hbox, FALSE, TRUE, 0 ); { - GtkVBox* vbox2 = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox2 ), TRUE, FALSE, 0 ); + auto vbox2 = create_dialog_vbox( 4 ); + hbox.pack_start( vbox2, TRUE, FALSE, 0 ); { auto frame = create_dialog_frame( 0, ui::Shadow::IN ); - gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( frame ), FALSE, FALSE, 0 ); + vbox2.pack_start( frame, FALSE, FALSE, 0 ); { auto image = new_local_image( "logo.png" ); image.show(); @@ -466,112 +449,102 @@ void DoAbout(){ } { - char const *label_text = "NetRadiant " RADIANT_VERSION "\n" + char const *label_text = RADIANT_NAME " " RADIANT_VERSION_STRING "\n" __DATE__ "\n\n" - RADIANT_ABOUTMSG "\n\n" + RADIANT_ABOUTMSG "\n\n" "This program is free software\n" "licensed under the GNU GPL.\n\n" - "NetRadiant is unsupported, however\n" + RADIANT_NAME " is unsupported, however\n" "you may report your problems at\n" - "https://gitlab.com/xonotic/netradiant/issues"; + "" + "gitlab.com/xonotic/netradiant/issues" + ""; auto label = ui::Label( label_text ); + gtk_label_set_use_markup( GTK_LABEL( label ), true ); label.show(); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 ); + hbox.pack_start( label, FALSE, FALSE, 0 ); gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 ); gtk_label_set_justify( label, GTK_JUSTIFY_LEFT ); } { - GtkVBox* vbox2 = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox2 ), FALSE, TRUE, 0 ); + auto vbox2 = create_dialog_vbox( 4 ); + hbox.pack_start( vbox2, FALSE, TRUE, 0 ); { - GtkButton* button = create_modal_dialog_button( "OK", ok_button ); - gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + auto button = create_modal_dialog_button( "OK", ok_button ); + vbox2.pack_start( button, FALSE, FALSE, 0 ); } { - GtkButton* button = create_dialog_button( "Credits", G_CALLBACK( about_button_credits ), 0 ); - gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + auto button = create_dialog_button( "Credits", G_CALLBACK( about_button_credits ), 0 ); + vbox2.pack_start( button, FALSE, FALSE, 0 ); } { - GtkButton* button = create_dialog_button( "Changes", G_CALLBACK( about_button_changelog ), 0 ); - gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + auto button = create_dialog_button( "Changes", G_CALLBACK( about_button_changelog ), 0 ); + vbox2.pack_start( button, FALSE, FALSE, 0 ); } { - GtkButton* button = create_dialog_button( "Issues", G_CALLBACK( about_button_issues ), 0 ); - gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + auto button = create_dialog_button( "Issues", G_CALLBACK( about_button_issues ), 0 ); + vbox2.pack_start( button, FALSE, FALSE, 0 ); } } } { auto frame = create_dialog_frame( "OpenGL Properties" ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( frame ), FALSE, FALSE, 0 ); + vbox.pack_start( frame, FALSE, FALSE, 0 ); { auto table = create_dialog_table( 3, 2, 4, 4, 4 ); frame.add(table); { auto label = ui::Label( "Vendor:" ); label.show(); - gtk_table_attach( table, GTK_WIDGET( label ), 0, 1, 0, 1, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(label, {0, 1, 0, 1}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } { auto label = ui::Label( "Version:" ); label.show(); - gtk_table_attach( table, GTK_WIDGET( label ), 0, 1, 1, 2, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(label, {0, 1, 1, 2}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } { auto label = ui::Label( "Renderer:" ); label.show(); - gtk_table_attach( table, GTK_WIDGET( label ), 0, 1, 2, 3, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(label, {0, 1, 2, 3}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } { auto label = ui::Label( reinterpret_cast( glGetString( GL_VENDOR ) ) ); label.show(); - gtk_table_attach( table, GTK_WIDGET( label ), 1, 2, 0, 1, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(label, {1, 2, 0, 1}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } { auto label = ui::Label( reinterpret_cast( glGetString( GL_VERSION ) ) ); label.show(); - gtk_table_attach( table, GTK_WIDGET( label ), 1, 2, 1, 2, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(label, {1, 2, 1, 2}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } { auto label = ui::Label( reinterpret_cast( glGetString( GL_RENDERER ) ) ); label.show(); - gtk_table_attach( table, GTK_WIDGET( label ), 1, 2, 2, 3, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(label, {1, 2, 2, 3}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } } { auto frame = create_dialog_frame( "OpenGL Extensions" ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( frame ), TRUE, TRUE, 0 ); + vbox.pack_start( frame, TRUE, TRUE, 0 ); { auto sc_extensions = create_scrolled_window( ui::Policy::AUTOMATIC, ui::Policy::ALWAYS, 4 ); frame.add(sc_extensions); { - auto text_extensions = ui::TextView(); - gtk_text_view_set_editable( GTK_TEXT_VIEW( text_extensions ), FALSE ); + auto text_extensions = ui::TextView(ui::New); + gtk_text_view_set_editable( text_extensions, FALSE ); sc_extensions.add(text_extensions); - GtkTextBuffer* buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW( text_extensions ) ); - gtk_text_buffer_set_text( buffer, reinterpret_cast( glGetString( GL_EXTENSIONS ) ), -1 ); - gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( text_extensions ), GTK_WRAP_WORD ); + text_extensions.text(reinterpret_cast(glGetString(GL_EXTENSIONS))); + gtk_text_view_set_wrap_mode( text_extensions, GTK_WRAP_WORD ); text_extensions.show(); } } @@ -581,7 +554,7 @@ void DoAbout(){ modal_dialog_show( window, dialog ); - gtk_widget_destroy( GTK_WIDGET( window ) ); + window.destroy(); } // ============================================================================= @@ -595,82 +568,74 @@ EMessageBoxReturn DoTextureLayout( float *fx, float *fy ){ ModalDialog dialog; ModalDialogButton ok_button( dialog, eIDOK ); ModalDialogButton cancel_button( dialog, eIDCANCEL ); - GtkEntry* x; - GtkEntry* y; + ui::Entry x{ui::null}; + ui::Entry y{ui::null}; auto window = MainFrame_getWindow().create_modal_dialog_window("Patch texture layout", dialog ); - auto accel = ui::AccelGroup(); + auto accel = ui::AccelGroup(ui::New); window.add_accel_group( accel ); { auto hbox = create_dialog_hbox( 4, 4 ); window.add(hbox); { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 ); + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, TRUE, TRUE, 0 ); { auto label = ui::Label( "Texture will be fit across the patch based\n" "on the x and y values given. Values of 1x1\n" "will \"fit\" the texture. 2x2 will repeat\n" "it twice, etc." ); label.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), TRUE, TRUE, 0 ); + vbox.pack_start( label, TRUE, TRUE, 0 ); gtk_label_set_justify( label, GTK_JUSTIFY_LEFT ); } { auto table = create_dialog_table( 2, 2, 4, 4 ); table.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( table ), TRUE, TRUE, 0 ); + vbox.pack_start( table, TRUE, TRUE, 0 ); { auto label = ui::Label( "Texture x:" ); label.show(); - gtk_table_attach( table, GTK_WIDGET( label ), 0, 1, 0, 1, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(label, {0, 1, 0, 1}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } { auto label = ui::Label( "Texture y:" ); label.show(); - gtk_table_attach( table, GTK_WIDGET( label ), 0, 1, 1, 2, - (GtkAttachOptions) ( GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(label, {0, 1, 1, 2}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } { - auto entry = ui::Entry(); + auto entry = ui::Entry(ui::New); entry.show(); - gtk_table_attach( table, GTK_WIDGET( entry ), 1, 2, 0, 1, - (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(entry, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0}); x = entry; } { - auto entry = ui::Entry(); + auto entry = ui::Entry(ui::New); entry.show(); - gtk_table_attach( table, GTK_WIDGET( entry ), 1, 2, 1, 2, - (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), - (GtkAttachOptions) ( 0 ), 0, 0 ); + table.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0}); y = entry; } } } { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 ); + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, FALSE, FALSE, 0 ); { auto button = create_modal_dialog_button( "OK", ok_button ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + vbox.pack_start( button, FALSE, FALSE, 0 ); widget_make_default( button ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 ); + gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 ); } { - GtkButton* button = create_modal_dialog_button( "Cancel", cancel_button ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 ); + auto button = create_modal_dialog_button( "Cancel", cancel_button ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + gtk_widget_add_accelerator( button , "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 ); } } } @@ -679,13 +644,13 @@ EMessageBoxReturn DoTextureLayout( float *fx, float *fy ){ char buf[16]; sprintf( buf, "%f", last_used_texture_layout_scale_x ); - gtk_entry_set_text( x, buf ); + x.text( buf ); sprintf( buf, "%f", last_used_texture_layout_scale_y ); - gtk_entry_set_text( y, buf ); + y.text( buf ); // Set focus after intializing the values - gtk_widget_grab_focus( GTK_WIDGET( x ) ); + gtk_widget_grab_focus( x ); EMessageBoxReturn ret = modal_dialog_show( window, dialog ); if ( ret == eIDOK ) { @@ -697,7 +662,7 @@ EMessageBoxReturn DoTextureLayout( float *fx, float *fy ){ last_used_texture_layout_scale_y = *fy; } - gtk_widget_destroy( GTK_WIDGET( window ) ); + window.destroy(); return ret; } @@ -706,15 +671,15 @@ EMessageBoxReturn DoTextureLayout( float *fx, float *fy ){ // Text Editor dialog // master window widget -static ui::Widget text_editor; -static ui::Widget text_widget; // slave, text widget from the gtk editor +static ui::Window text_editor{ui::null}; +static ui::Widget text_widget{ui::null}; // slave, text widget from the gtk editor static gint editor_delete( ui::Widget widget, gpointer data ){ - if ( widget.alert( "Close the shader editor ?", "Radiant", ui::alert_type::YESNO, ui::alert_icon::Question ) == ui::alert_response::NO ) { + if ( ui::alert( widget.window(), "Close the shader editor ?", "Radiant", ui::alert_type::YESNO, ui::alert_icon::Question ) == ui::alert_response::NO ) { return TRUE; } - gtk_widget_hide( text_editor ); + text_editor.hide(); return TRUE; } @@ -724,7 +689,7 @@ static void editor_save( ui::Widget widget, gpointer data ){ gpointer text = g_object_get_data( G_OBJECT( data ), "text" ); if ( f == 0 ) { - ui::Widget(GTK_WIDGET( data )).alert( "Error saving file !" ); + ui::alert( ui::Widget::from(data).window(), "Error saving file !" ); return; } @@ -734,56 +699,54 @@ static void editor_save( ui::Widget widget, gpointer data ){ } static void editor_close( ui::Widget widget, gpointer data ){ - if ( text_editor.alert( "Close the shader editor ?", "Radiant", ui::alert_type::YESNO, ui::alert_icon::Question ) == ui::alert_response::NO ) { + if ( ui::alert( text_editor.window(), "Close the shader editor ?", "Radiant", ui::alert_type::YESNO, ui::alert_icon::Question ) == ui::alert_response::NO ) { return; } - gtk_widget_hide( text_editor ); + text_editor.hide(); } static void CreateGtkTextEditor(){ - ui::Widget vbox, hbox, button, text; - auto dlg = ui::Window( ui::window_type::TOP ); dlg.connect( "delete_event", G_CALLBACK( editor_delete ), 0 ); - gtk_window_set_default_size( GTK_WINDOW( dlg ), 600, 300 ); + gtk_window_set_default_size( dlg, 600, 300 ); - vbox = ui::VBox( FALSE, 5 ); + auto vbox = ui::VBox( FALSE, 5 ); vbox.show(); dlg.add(vbox); gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 ); - auto scr = ui::ScrolledWindow(); + auto scr = ui::ScrolledWindow(ui::New); scr.show(); - gtk_box_pack_start( GTK_BOX( vbox ), scr, TRUE, TRUE, 0 ); + vbox.pack_start( scr, TRUE, TRUE, 0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN ); - text = ui::TextView(); + auto text = ui::TextView(ui::New); scr.add(text); text.show(); g_object_set_data( G_OBJECT( dlg ), "text", (gpointer) text ); - gtk_text_view_set_editable( GTK_TEXT_VIEW( text ), TRUE ); + gtk_text_view_set_editable( text, TRUE ); - hbox = ui::HBox( FALSE, 5 ); + auto hbox = ui::HBox( FALSE, 5 ); hbox.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox ), FALSE, TRUE, 0 ); + vbox.pack_start( hbox, FALSE, TRUE, 0 ); - button = ui::Button( "Close" ); + auto button = ui::Button( "Close" ); button.show(); - gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 ); + hbox.pack_end(button, FALSE, FALSE, 0); button.connect( "clicked", G_CALLBACK( editor_close ), dlg ); - gtk_widget_set_size_request( button, 60, -1 ); + button.dimensions(60, -1); button = ui::Button( "Save" ); button.show(); - gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 ); + hbox.pack_end(button, FALSE, FALSE, 0); button.connect( "clicked", G_CALLBACK( editor_save ), dlg ); - gtk_widget_set_size_request( button, 60, -1 ); + button.dimensions(60, -1); text_editor = dlg; text_widget = text; @@ -799,7 +762,7 @@ static void DoGtkTextEditor( const char* filename, guint cursorpos ){ if ( f == 0 ) { globalOutputStream() << "Unable to load file " << filename << " in shader editor.\n"; - gtk_widget_hide( text_editor ); + text_editor.hide(); } else { @@ -811,9 +774,9 @@ static void DoGtkTextEditor( const char* filename, guint cursorpos ){ rewind( f ); fread( buf, 1, len, f ); - gtk_window_set_title( GTK_WINDOW( text_editor ), filename ); + gtk_window_set_title( text_editor, filename ); - GtkTextBuffer* text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW( text_widget ) ); + auto text_buffer = gtk_text_view_get_buffer(ui::TextView::from(text_widget)); gtk_text_buffer_set_text( text_buffer, (char*)buf, len ); old_filename = g_object_get_data( G_OBJECT( text_editor ), "filename" ); @@ -825,8 +788,8 @@ static void DoGtkTextEditor( const char* filename, guint cursorpos ){ // trying to show later text_editor.show(); -#ifdef WIN32 - process_gui(); +#if GDEF_OS_WINDOWS + ui::process(); #endif // only move the cursor if it's not exceeding the size.. @@ -840,7 +803,7 @@ static void DoGtkTextEditor( const char* filename, guint cursorpos ){ gtk_text_buffer_place_cursor( text_buffer, &text_iter ); } -#ifdef WIN32 +#if GDEF_OS_WINDOWS gtk_widget_queue_draw( text_widget ); #endif @@ -854,64 +817,64 @@ static void DoGtkTextEditor( const char* filename, guint cursorpos ){ EMessageBoxReturn DoLightIntensityDlg( int *intensity ){ ModalDialog dialog; - GtkEntry* intensity_entry; + ui::Entry intensity_entry{ui::null}; ModalDialogButton ok_button( dialog, eIDOK ); ModalDialogButton cancel_button( dialog, eIDCANCEL ); ui::Window window = MainFrame_getWindow().create_modal_dialog_window("Light intensity", dialog, -1, -1 ); - auto accel_group = ui::AccelGroup(); + auto accel_group = ui::AccelGroup(ui::New); window.add_accel_group( accel_group ); { auto hbox = create_dialog_hbox( 4, 4 ); window.add(hbox); { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 ); + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, TRUE, TRUE, 0 ); { auto label = ui::Label( "ESC for default, ENTER to validate" ); label.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 ); + vbox.pack_start( label, FALSE, FALSE, 0 ); } { - auto entry = ui::Entry(); + auto entry = ui::Entry(ui::New); entry.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( entry ), TRUE, TRUE, 0 ); + vbox.pack_start( entry, TRUE, TRUE, 0 ); - gtk_widget_grab_focus( GTK_WIDGET( entry ) ); + gtk_widget_grab_focus( entry ); intensity_entry = entry; } } { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 ); + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, FALSE, FALSE, 0 ); { auto button = create_modal_dialog_button( "OK", ok_button ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + vbox.pack_start( button, FALSE, FALSE, 0 ); widget_make_default( button ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); + gtk_widget_add_accelerator( button , "clicked", accel_group, GDK_KEY_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); } { - GtkButton* button = create_modal_dialog_button( "Cancel", cancel_button ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Escape, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); + auto button = create_modal_dialog_button( "Cancel", cancel_button ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + gtk_widget_add_accelerator( button , "clicked", accel_group, GDK_KEY_Escape, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); } } } char buf[16]; sprintf( buf, "%d", *intensity ); - gtk_entry_set_text( intensity_entry, buf ); + intensity_entry.text(buf); EMessageBoxReturn ret = modal_dialog_show( window, dialog ); if ( ret == eIDOK ) { *intensity = atoi( gtk_entry_get_text( intensity_entry ) ); } - gtk_widget_destroy( GTK_WIDGET( window ) ); + window.destroy(); return ret; } @@ -919,53 +882,51 @@ EMessageBoxReturn DoLightIntensityDlg( int *intensity ){ // ============================================================================= // Add new shader tag dialog -EMessageBoxReturn DoShaderTagDlg( CopiedString* tag, char* title ){ +EMessageBoxReturn DoShaderTagDlg( CopiedString* tag, const char* title ){ ModalDialog dialog; - GtkEntry* textentry; ModalDialogButton ok_button( dialog, eIDOK ); ModalDialogButton cancel_button( dialog, eIDCANCEL ); auto window = MainFrame_getWindow().create_modal_dialog_window(title, dialog, -1, -1 ); - auto accel_group = ui::AccelGroup(); + auto accel_group = ui::AccelGroup(ui::New); window.add_accel_group( accel_group ); + auto textentry = ui::Entry(ui::New); { auto hbox = create_dialog_hbox( 4, 4 ); window.add(hbox); { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 ); + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, TRUE, TRUE, 0 ); { //GtkLabel* label = GTK_LABEL(gtk_label_new("Enter one ore more tags separated by spaces")); auto label = ui::Label( "ESC to cancel, ENTER to validate" ); label.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 ); + vbox.pack_start( label, FALSE, FALSE, 0 ); } { - auto entry = ui::Entry(); + auto entry = textentry; entry.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( entry ), TRUE, TRUE, 0 ); - - gtk_widget_grab_focus( GTK_WIDGET( entry ) ); + vbox.pack_start( entry, TRUE, TRUE, 0 ); - textentry = entry; + gtk_widget_grab_focus( entry ); } } { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 ); + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, FALSE, FALSE, 0 ); { auto button = create_modal_dialog_button( "OK", ok_button ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + vbox.pack_start( button, FALSE, FALSE, 0 ); widget_make_default( button ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); + gtk_widget_add_accelerator( button , "clicked", accel_group, GDK_KEY_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); } { - GtkButton* button = create_modal_dialog_button( "Cancel", cancel_button ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Escape, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); + auto button = create_modal_dialog_button( "Cancel", cancel_button ); + vbox.pack_start( button, FALSE, FALSE, 0 ); + gtk_widget_add_accelerator( button , "clicked", accel_group, GDK_KEY_Escape, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); } } } @@ -975,69 +936,69 @@ EMessageBoxReturn DoShaderTagDlg( CopiedString* tag, char* title ){ *tag = gtk_entry_get_text( textentry ); } - gtk_widget_destroy( GTK_WIDGET( window ) ); + window.destroy(); return ret; } -EMessageBoxReturn DoShaderInfoDlg( const char* name, const char* filename, char* title ){ +EMessageBoxReturn DoShaderInfoDlg( const char* name, const char* filename, const char* title ){ ModalDialog dialog; ModalDialogButton ok_button( dialog, eIDOK ); auto window = MainFrame_getWindow().create_modal_dialog_window(title, dialog, -1, -1 ); - auto accel_group = ui::AccelGroup(); + auto accel_group = ui::AccelGroup(ui::New); window.add_accel_group( accel_group ); { auto hbox = create_dialog_hbox( 4, 4 ); window.add(hbox); { - GtkVBox* vbox = create_dialog_vbox( 4 ); - gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 ); + auto vbox = create_dialog_vbox( 4 ); + hbox.pack_start( vbox, FALSE, FALSE, 0 ); { auto label = ui::Label( "The selected shader" ); label.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 ); + vbox.pack_start( label, FALSE, FALSE, 0 ); } { auto label = ui::Label( name ); label.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 ); + vbox.pack_start( label, FALSE, FALSE, 0 ); } { auto label = ui::Label( "is located in file" ); label.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 ); + vbox.pack_start( label, FALSE, FALSE, 0 ); } { auto label = ui::Label( filename ); label.show(); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 ); + vbox.pack_start( label, FALSE, FALSE, 0 ); } { auto button = create_modal_dialog_button( "OK", ok_button ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 ); + vbox.pack_start( button, FALSE, FALSE, 0 ); widget_make_default( button ); - gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); + gtk_widget_add_accelerator( button , "clicked", accel_group, GDK_KEY_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE ); } } } EMessageBoxReturn ret = modal_dialog_show( window, dialog ); - gtk_widget_destroy( GTK_WIDGET( window ) ); + window.destroy(); return ret; } -#ifdef WIN32 +#if GDEF_OS_WINDOWS #include #endif -#ifdef WIN32 +#if GDEF_OS_WINDOWS // use the file associations to open files instead of builtin Gtk editor bool g_TextEditor_useWin32Editor = true; #else @@ -1047,7 +1008,7 @@ CopiedString g_TextEditor_editorCommand( "" ); #endif void DoTextEditor( const char* filename, int cursorpos ){ -#ifdef WIN32 +#if GDEF_OS_WINDOWS if ( g_TextEditor_useWin32Editor ) { globalOutputStream() << "opening file '" << filename << "' (line " << cursorpos << " info ignored)\n"; ShellExecute( (HWND)GDK_WINDOW_HWND( gtk_widget_get_window( MainFrame_getWindow() ) ), "open", filename, 0, 0, SW_SHOW );