X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fgtkdlgs.cpp;h=4c09dc48aeb64cf710dbc31a5781b9eef9ff72d7;hb=c692cc9ef765593ba8afb5444eaf5a49caaa0514;hp=8338c2031e63af34ebce560e0716c76ed40de7a1;hpb=a9e5bfdf2a458e89978ee52ebbd3711884b54b29;p=xonotic%2Fnetradiant.git diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index 8338c203..4c09dc48 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -40,7 +40,6 @@ #include #include "debugging/debugging.h" -#include "version.h" #include "aboutmsg.h" #include "igl.h" @@ -199,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 ){ @@ -353,13 +352,13 @@ 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(ui::New); window.add_accel_group( accel ); + auto sides_entry = ui::Entry(ui::New); { auto hbox = create_dialog_hbox( 4, 4 ); window.add(hbox); @@ -369,10 +368,9 @@ void DoSides( int type, int axis ){ hbox.pack_start( label, FALSE, FALSE, 0 ); } { - auto entry = ui::Entry(ui::New); + auto entry = sides_entry; entry.show(); hbox.pack_start( entry, FALSE, FALSE, 0 ); - sides_entry = entry; gtk_widget_grab_focus( entry ); } { @@ -416,17 +414,30 @@ 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() ); } +static void AddParagraph( ui::VBox vbox, const char* text, bool use_markup ){ + auto label = ui::Label( text ); + gtk_label_set_use_markup( GTK_LABEL( label ), use_markup ); + gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 ); + gtk_label_set_justify( label, GTK_JUSTIFY_LEFT ); + label.show(); + vbox.pack_start( label, TRUE, TRUE, 0 ); +} + +static void AddParagraph( ui::VBox vbox, const char* text ){ + AddParagraph( vbox, text, false ); +} + 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 ); @@ -434,11 +445,11 @@ void DoAbout(){ { auto hbox = create_dialog_hbox( 4 ); - vbox.pack_start( hbox, FALSE, TRUE, 0 ); + vbox.pack_start( hbox, FALSE, FALSE, 0 ); { auto vbox2 = create_dialog_vbox( 4 ); - hbox.pack_start( vbox2, TRUE, FALSE, 0 ); + hbox.pack_start( vbox2, FALSE, FALSE, 5 ); { auto frame = create_dialog_frame( 0, ui::Shadow::IN ); vbox2.pack_start( frame, FALSE, FALSE, 0 ); @@ -451,29 +462,44 @@ void DoAbout(){ } { - char const *label_text = "NetRadiant " RADIANT_VERSION "\n" - __DATE__ "\n\n" - RADIANT_ABOUTMSG "\n\n" - "This program is free software\n" - "licensed under the GNU GPL.\n\n" - "NetRadiant is unsupported, however\n" - "you may report your problems at\n" - "https://gitlab.com/xonotic/netradiant/issues"; - - auto label = ui::Label( label_text ); - - label.show(); - 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 ); + // HACK: that may not be related to font size + auto about_vbox = ui::VBox( FALSE, 5 ); + about_vbox.show(); + hbox.pack_start( about_vbox, FALSE, FALSE, 0 ); + + AddParagraph( about_vbox, + RADIANT_NAME " " RADIANT_VERSION_STRING " (" __DATE__ ")\n" + RADIANT_ABOUTMSG ); + AddParagraph( about_vbox, + "Get news and latest build at " + "" + "netradiant.gitlab.io" + "\n" + "Please report your issues at " + "" + "gitlab.com/xonotic/netradiant/issues" + "\n" + "The team cannot provide support for custom builds.", true ); + AddParagraph( about_vbox, + RADIANT_NAME " is a community project maintained by " + "" + "Xonotic" + "\n" + "and developed with help from " + "" + "other game projects" + " and individuals. ", true ); + AddParagraph( about_vbox, + "This program is free software licensed under the GNU GPL." ); } { auto vbox2 = create_dialog_vbox( 4 ); - hbox.pack_start( vbox2, FALSE, TRUE, 0 ); + hbox.pack_start( vbox2, TRUE, TRUE, 0 ); { auto button = create_modal_dialog_button( "OK", ok_button ); vbox2.pack_start( button, FALSE, FALSE, 0 ); + gtk_widget_grab_focus( GTK_WIDGET( button ) ); } { auto button = create_dialog_button( "Credits", G_CALLBACK( about_button_credits ), 0 ); @@ -674,7 +700,7 @@ 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.window().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; } @@ -688,7 +714,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::from(data).window().alert( "Error saving file !" ); + ui::alert( ui::Widget::from(data).window(), "Error saving file !" ); return; } @@ -698,7 +724,7 @@ static void editor_save( ui::Widget widget, gpointer data ){ } static void editor_close( ui::Widget widget, gpointer data ){ - if ( text_editor.window().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; } @@ -775,7 +801,7 @@ static void DoGtkTextEditor( const char* filename, guint cursorpos ){ gtk_window_set_title( text_editor, filename ); - GtkTextBuffer *text_buffer = gtk_text_view_get_buffer(ui::TextView::from(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" ); @@ -883,7 +909,6 @@ EMessageBoxReturn DoLightIntensityDlg( int *intensity ){ EMessageBoxReturn DoShaderTagDlg( CopiedString* tag, const char* title ){ ModalDialog dialog; - GtkEntry* textentry; ModalDialogButton ok_button( dialog, eIDOK ); ModalDialogButton cancel_button( dialog, eIDCANCEL ); @@ -892,6 +917,7 @@ EMessageBoxReturn DoShaderTagDlg( CopiedString* tag, const char* title ){ 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); @@ -905,13 +931,11 @@ EMessageBoxReturn DoShaderTagDlg( CopiedString* tag, const char* title ){ vbox.pack_start( label, FALSE, FALSE, 0 ); } { - auto entry = ui::Entry(ui::New); + auto entry = textentry; entry.show(); vbox.pack_start( entry, TRUE, TRUE, 0 ); gtk_widget_grab_focus( entry ); - - textentry = entry; } } {