Changeset 1818 in orxonox.OLD for orxonox/branches/bensch
- Timestamp:
- Apr 14, 2004, 12:38:24 AM (21 years ago)
- Location:
- orxonox/branches/bensch
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/bensch/orxonox_gui.c
r1817 r1818 44 44 gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame(orxonox_settings), TRUE, TRUE, 0); 45 45 46 gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame( ), TRUE, TRUE, 0);46 gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame(orxonox_settings), TRUE, TRUE, 0); 47 47 } 48 48 gtk_box_pack_start (GTK_BOX (vbox_main), hbox_video_audio, TRUE, TRUE, 0); … … 56 56 */ 57 57 { 58 gtk_box_pack_start(GTK_BOX(hbox_view_exec), orxonox_gui_exec_frame( ), TRUE, TRUE, 0);58 gtk_box_pack_start(GTK_BOX(hbox_view_exec), orxonox_gui_exec_frame(orxonox_settings), TRUE, TRUE, 0); 59 59 60 60 } -
orxonox/branches/bensch/orxonox_gui_audio.c
r1816 r1818 1 1 #include "orxonox_gui.h" 2 2 3 GtkWidget *orxonox_gui_audio_frame ( void)3 GtkWidget *orxonox_gui_audio_frame (struct settings *orxonox_settings) 4 4 { 5 5 GtkWidget *frame; 6 GtkWidget * button;6 GtkWidget *enable_sound_button; 7 7 GtkWidget *label; 8 8 GtkWidget *music_volume_slider; … … 15 15 { 16 16 17 button = gtk_check_button_new_with_label ("Enable Sound"); 18 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound); 19 */ 20 gtk_box_pack_start(GTK_BOX (orxonox_gui_audio_vbox), button, TRUE, TRUE, 0); 17 enable_sound_button = gtk_check_button_new_with_label ("Enable Sound"); 18 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_sound_button), orxonox_settings->audio_enable_sound); 19 gtk_box_pack_start(GTK_BOX (orxonox_gui_audio_vbox), enable_sound_button, TRUE, TRUE, 0); 21 20 22 21 label=gtk_label_new ("Music Volume"); 23 22 gtk_box_pack_start (GTK_BOX(orxonox_gui_audio_vbox), label, TRUE, TRUE, 0); 24 23 music_volume_slider = gtk_hscale_new_with_range (0,100,5); 25 /* gtk_range_set_value ( GTK_RANGE (music_volume_slider), compress.video_filter_crop_slider[0]);*/24 gtk_range_set_value ( GTK_RANGE (music_volume_slider), orxonox_settings->audio_music_volume); 26 25 gtk_range_set_update_policy ( GTK_RANGE (music_volume_slider), GTK_UPDATE_DISCONTINUOUS); 27 26 /* g_signal_connect (GTK_RANGE (music_volume_slider), "valume_changed", G_CALLBACK (video_filter_crop_slider_changed), GINT_TO_POINTER (0));*/ … … 31 30 gtk_box_pack_start (GTK_BOX(orxonox_gui_audio_vbox), label, TRUE, TRUE, 0); 32 31 effects_volume_slider = gtk_hscale_new_with_range (0,100,5); 33 /* gtk_range_set_value ( GTK_RANGE (effects_volume_slider), compress.video_filter_crop_slider[0]);*/32 gtk_range_set_value ( GTK_RANGE (effects_volume_slider), orxonox_settings->audio_effects_volume); 34 33 gtk_range_set_update_policy ( GTK_RANGE (effects_volume_slider), GTK_UPDATE_DISCONTINUOUS); 35 34 /* g_signal_connect (GTK_RANGE (effects_volume_slider), "valume_changed", G_CALLBACK (video_filter_crop_slider_changed), GINT_TO_POINTER (0));*/ -
orxonox/branches/bensch/orxonox_gui_audio.h
r1816 r1818 2 2 #define _ORXONOX_GUI_AUDIO_H 3 3 4 GtkWidget *orxonox_gui_audio_frame ( void);4 GtkWidget *orxonox_gui_audio_frame (struct settings *orxonox_settings); 5 5 6 6 #endif /* _ORXONOX_GUI_AUDIO_H */ -
orxonox/branches/bensch/orxonox_gui_exec.c
r1816 r1818 1 1 #include "orxonox_gui.h" 2 2 3 GtkWidget *orxonox_gui_exec_frame ( void)3 GtkWidget *orxonox_gui_exec_frame (struct settings *orxonox_settings) 4 4 { 5 5 GtkWidget *frame; 6 GtkWidget *save_ button;7 GtkWidget *show_ button;6 GtkWidget *save_settings_button; 7 GtkWidget *show_menu_button; 8 8 GtkWidget *start_button; 9 9 GtkWidget *quit_button; … … 16 16 17 17 start_button = gtk_button_new_with_label ("Start"); 18 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_fullscreen);19 */20 18 gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), start_button, TRUE, TRUE, 5); 21 19 22 save_button = gtk_check_button_new_with_label ("Save Settings"); 23 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound); 24 */ 25 gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), save_button, TRUE, TRUE, 0); 20 save_settings_button = gtk_check_button_new_with_label ("Save Settings"); 21 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (save_settings_button), orxonox_settings->exec_save_settings); 22 gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), save_settings_button, TRUE, TRUE, 0); 26 23 27 show_button = gtk_check_button_new_with_label ("Always show this Menu"); 28 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound); 29 */ 30 gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), show_button, TRUE, TRUE, 0); 24 show_menu_button = gtk_check_button_new_with_label ("Always show this Menu"); 25 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (show_menu_button), orxonox_settings->exec_show_menu); 26 gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), show_menu_button, TRUE, TRUE, 0); 31 27 32 28 -
orxonox/branches/bensch/orxonox_gui_exec.h
r1816 r1818 2 2 #define _ORXONOX_GUI_EXEC_H 3 3 4 GtkWidget *orxonox_gui_exec_frame ( void);4 GtkWidget *orxonox_gui_exec_frame (struct settings *orxonox_settings); 5 5 6 6 #endif /* _ORXONOX_GUI_EXEC_H */
Note: See TracChangeset
for help on using the changeset viewer.