- Timestamp:
- Apr 13, 2004, 11:26:09 PM (21 years ago)
- Location:
- orxonox/branches/bensch
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/bensch/Makefile
r1814 r1816 104 104 distuninstallcheck_listfiles = find . -type f -print 105 105 distcleancheck_listfiles = find . -type f -print 106 ACLOCAL = aclocal-1.8106 ACLOCAL = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run aclocal-1.8 107 107 ALLOCA = 108 108 AMDEP_FALSE = # 109 109 AMDEP_TRUE = 110 AMTAR = tar111 AUTOCONF = autoconf112 AUTOHEADER = autoheader113 AUTOMAKE = automake-1.8110 AMTAR = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run tar 111 AUTOCONF = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoconf 112 AUTOHEADER = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoheader 113 AUTOMAKE = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run automake-1.8 114 114 AWK = gawk 115 115 CC = gcc … … 135 135 LIBS = 136 136 LTLIBOBJS = 137 MAKEINFO = makeinfo137 MAKEINFO = ${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run makeinfo 138 138 OBJEXT = o 139 139 PACKAGE = orxonox -
orxonox/branches/bensch/config.log
r1814 r1816 50 50 configure:1404: checking whether build environment is sane 51 51 configure:1447: result: yes 52 configure:1471: WARNING: `missing' script is too old or missing53 52 configure:1504: checking for gawk 54 53 configure:1520: found /bin/gawk … … 906 905 ## ----------------- ## 907 906 908 ACLOCAL=' aclocal-1.8'907 ACLOCAL='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run aclocal-1.8' 909 908 ALLOCA='' 910 909 AMDEPBACKSLASH='\' 911 910 AMDEP_FALSE='#' 912 911 AMDEP_TRUE='' 913 AMTAR=' tar'914 AUTOCONF=' autoconf'915 AUTOHEADER=' autoheader'916 AUTOMAKE=' automake-1.8'912 AMTAR='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run tar' 913 AUTOCONF='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoconf' 914 AUTOHEADER='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoheader' 915 AUTOMAKE='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run automake-1.8' 917 916 AWK='gawk' 918 917 CC='gcc' … … 938 937 LIBS='' 939 938 LTLIBOBJS='' 940 MAKEINFO=' makeinfo'939 MAKEINFO='${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run makeinfo' 941 940 OBJEXT='o' 942 941 PACKAGE='orxonox' … … 1050 1049 config.status:696: creating orxonox.spec 1051 1050 config.status:800: creating config.h 1051 config.status:944: config.h is unchanged 1052 1052 config.status:1121: executing depfiles commands 1053 1053 … … 1063 1063 CONFIG_LINKS = 1064 1064 CONFIG_COMMANDS = 1065 $ ./config.status Makefile depfiles1065 $ ./config.status config.h 1066 1066 1067 1067 on iasius 1068 1068 1069 config.status: 696: creating Makefile1070 config.status: 1121: executing depfiles commands1069 config.status:800: creating config.h 1070 config.status:944: config.h is unchanged -
orxonox/branches/bensch/config.status
r1814 r1816 491 491 s,@PACKAGE@,orxonox,;t t 492 492 s,@VERSION@,0.0.0,;t t 493 s,@ACLOCAL@, aclocal-1.8,;t t494 s,@AUTOCONF@, autoconf,;t t495 s,@AUTOMAKE@, automake-1.8,;t t496 s,@AUTOHEADER@, autoheader,;t t497 s,@MAKEINFO@, makeinfo,;t t498 s,@AMTAR@, tar,;t t493 s,@ACLOCAL@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run aclocal-1.8,;t t 494 s,@AUTOCONF@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoconf,;t t 495 s,@AUTOMAKE@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run automake-1.8,;t t 496 s,@AUTOHEADER@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run autoheader,;t t 497 s,@MAKEINFO@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run makeinfo,;t t 498 s,@AMTAR@,${SHELL} /home/bensch/svn/orxonox/branches/bensch/missing --run tar,;t t 499 499 s,@install_sh@,/home/bensch/svn/orxonox/branches/bensch/install-sh,;t t 500 500 s,@STRIP@,,;t t -
orxonox/branches/bensch/orxonox_gui.c
r1813 r1816 36 36 37 37 { 38 gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame( hbox_video_audio), TRUE, TRUE, 0);38 gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame(), TRUE, TRUE, 0); 39 39 40 gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame( hbox_video_audio), TRUE, TRUE, 0);40 gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame(), TRUE, TRUE, 0); 41 41 } 42 42 gtk_box_pack_start (GTK_BOX (vbox_main), hbox_video_audio, TRUE, TRUE, 0); … … 50 50 */ 51 51 { 52 gtk_box_pack_start(GTK_BOX(hbox_vi deo_audio), orxonox_gui_exec_frame(hbox_video_audio), TRUE, TRUE, 0);52 gtk_box_pack_start(GTK_BOX(hbox_view_exec), orxonox_gui_exec_frame(), TRUE, TRUE, 0); 53 53 54 54 } -
orxonox/branches/bensch/orxonox_gui_audio.c
r1813 r1816 1 1 #include "orxonox_gui.h" 2 2 3 GtkWidget *orxonox_gui_audio_frame ( GtkWidget *box)3 GtkWidget *orxonox_gui_audio_frame (void) 4 4 { 5 5 GtkWidget *frame; 6 6 GtkWidget *button; 7 GtkWidget *label; 8 GtkWidget *music_volume_slider; 9 GtkWidget *effects_volume_slider; 7 10 8 11 frame = gtk_frame_new ( "Audio-Options:"); … … 13 16 14 17 button = gtk_check_button_new_with_label ("Enable Sound"); 15 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_ fullscreen);18 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_audio_Enable_sound); 16 19 */ 17 20 gtk_box_pack_start(GTK_BOX (orxonox_gui_audio_vbox), button, TRUE, TRUE, 0); 21 22 label=gtk_label_new ("Music Volume"); 23 gtk_box_pack_start (GTK_BOX(orxonox_gui_audio_vbox), label, TRUE, TRUE, 0); 24 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]);*/ 26 gtk_range_set_update_policy ( GTK_RANGE (music_volume_slider), GTK_UPDATE_DISCONTINUOUS); 27 /* g_signal_connect (GTK_RANGE (music_volume_slider), "valume_changed", G_CALLBACK (video_filter_crop_slider_changed), GINT_TO_POINTER (0));*/ 28 gtk_box_pack_start ( GTK_BOX (orxonox_gui_audio_vbox), music_volume_slider, TRUE, TRUE, 0); 29 30 label=gtk_label_new ("Effects Volume"); 31 gtk_box_pack_start (GTK_BOX(orxonox_gui_audio_vbox), label, TRUE, TRUE, 0); 32 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]);*/ 34 gtk_range_set_update_policy ( GTK_RANGE (effects_volume_slider), GTK_UPDATE_DISCONTINUOUS); 35 /* g_signal_connect (GTK_RANGE (effects_volume_slider), "valume_changed", G_CALLBACK (video_filter_crop_slider_changed), GINT_TO_POINTER (0));*/ 36 gtk_box_pack_start ( GTK_BOX (orxonox_gui_audio_vbox), effects_volume_slider, TRUE, TRUE, 0); 37 18 38 } 19 39 gtk_container_add(GTK_CONTAINER(frame), orxonox_gui_audio_vbox); -
orxonox/branches/bensch/orxonox_gui_audio.h
r1809 r1816 2 2 #define _ORXONOX_GUI_AUDIO_H 3 3 4 GtkWidget *orxonox_gui_audio_frame ( GtkWidget *box);4 GtkWidget *orxonox_gui_audio_frame (void); 5 5 6 6 #endif /* _ORXONOX_GUI_AUDIO_H */ -
orxonox/branches/bensch/orxonox_gui_exec.c
r1813 r1816 1 1 #include "orxonox_gui.h" 2 2 3 GtkWidget *orxonox_gui_exec_frame ( GtkWidget *box)3 GtkWidget *orxonox_gui_exec_frame (void) 4 4 { 5 5 GtkWidget *frame; 6 GtkWidget *button; 6 GtkWidget *save_button; 7 GtkWidget *show_button; 8 GtkWidget *start_button; 9 GtkWidget *quit_button; 7 10 8 11 frame = gtk_frame_new ( "Execute-Tags:"); … … 12 15 { 13 16 14 button = gtk_button_new_with_label ("Start");17 start_button = gtk_button_new_with_label ("Start"); 15 18 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_fullscreen); 16 19 */ 17 gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), button, TRUE, TRUE, 0); 20 gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), start_button, TRUE, TRUE, 5); 21 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); 26 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); 31 32 33 quit_button = gtk_button_new_with_label ("quit"); 34 g_signal_connect(GTK_BUTTON(quit_button), "clicked", G_CALLBACK(gtk_main_quit), NULL); 35 gtk_box_pack_start(GTK_BOX (orxonox_gui_exec_vbox), quit_button, FALSE, FALSE, 5); 18 36 } 19 37 gtk_container_add(GTK_CONTAINER(frame), orxonox_gui_exec_vbox); -
orxonox/branches/bensch/orxonox_gui_exec.h
r1812 r1816 2 2 #define _ORXONOX_GUI_EXEC_H 3 3 4 GtkWidget *orxonox_gui_exec_frame ( GtkWidget *box);4 GtkWidget *orxonox_gui_exec_frame (void); 5 5 6 6 #endif /* _ORXONOX_GUI_EXEC_H */ -
orxonox/branches/bensch/orxonox_gui_video.c
r1813 r1816 1 1 #include "orxonox_gui.h" 2 2 3 GtkWidget *orxonox_gui_video_frame ( GtkWidget *box)3 GtkWidget *orxonox_gui_video_frame (void) 4 4 { 5 5 GtkWidget *frame; … … 11 11 orxonox_gui_video_vbox = gtk_vbox_new (FALSE, 0); 12 12 { 13 14 13 button = gtk_check_button_new_with_label ("Fullscreen-mode"); 15 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_ fullscreen);14 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_video_fullscreen); 16 15 */ 17 16 gtk_box_pack_start(GTK_BOX (orxonox_gui_video_vbox), button, TRUE, TRUE, 0); 17 18 button = gtk_check_button_new_with_label ("Wireframe-mode"); 19 /* gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_video_Wireframe); 20 */ 21 gtk_box_pack_start(GTK_BOX (orxonox_gui_video_vbox), button, TRUE, TRUE, 0); 22 18 23 } 19 24 gtk_container_add(GTK_CONTAINER(frame), orxonox_gui_video_vbox); -
orxonox/branches/bensch/orxonox_gui_video.h
r1809 r1816 2 2 #define _ORXONOX_GUI_VIDEO_H 3 3 4 GtkWidget *orxonox_gui_video_frame ( GtkWidget *box);4 GtkWidget *orxonox_gui_video_frame (void); 5 5 6 6 #endif /* _ORXONOX_GUI_VIDEO_H */
Note: See TracChangeset
for help on using the changeset viewer.