Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4091 in orxonox.OLD for orxonox/trunk/src/lib/gui


Ignore:
Timestamp:
May 6, 2005, 8:02:26 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: now All options get loaded in new style (be aware, quiting only works with ESCAPE, not q, but of corse you can change this now in the GUI

Location:
orxonox/trunk/src/lib/gui/gui
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/gui/gui/gui_audio.cc

    r4056 r4091  
    3636
    3737  audioFrame = new Frame("Audio-Options:");
    38   audioFrame->setGroupName("audio");
     38  audioFrame->setGroupName(CONFIG_SECTION_AUDIO);
    3939  {
    4040    Box* audioBox;            //!< The Box that holds the audio Options.
     
    4545      Slider* effectsVolume;    //!< A Slider for effects volume.
    4646     
    47       enableSound = new CheckButton("Disable Sound");
     47      enableSound = new CheckButton(CONFIG_NAME_DISABLE_AUDIO);
    4848      enableSound->setFlagName ("no-sound", 0);
    4949      enableSound->saveability();
    5050      audioBox->fill(enableSound);
    51       Label* musicVolumeLabel = new Label("Music Volume");
     51      Label* musicVolumeLabel = new Label(CONFIG_NAME_MUSIC_VOLUME);
    5252      audioBox->fill(musicVolumeLabel);
    5353      musicVolume = new Slider("Music Volume", 0, 100);
     
    5555      musicVolume->saveability();
    5656      audioBox->fill (musicVolume);
    57       Label* effectsVolumeLabel = new Label ("Effects Volume");
     57      Label* effectsVolumeLabel = new Label (CONFIG_NAME_EFFECTS_VOLUME);
    5858      audioBox->fill (effectsVolumeLabel);
    5959      effectsVolume = new Slider ("Effects Volume", 0, 100);
  • orxonox/trunk/src/lib/gui/gui/gui_exec.cc

    r4071 r4091  
    5353
    5454    execBox = new Box('v');
    55     execFrame->setGroupName("misc");
     55    execFrame->setGroupName(CONFIG_SECTION_MISC);
    5656    {
    5757      Button* start;               //!< The start Button of orxonox.
     
    6565#endif /* HAVE_GTK2 */
    6666      execBox->fill(start);
    67       this->saveSettings = new CheckButton("Save Settings");
     67      this->saveSettings = new CheckButton(CONFIG_NAME_SAVE_SETTINGS);
    6868      this->saveSettings->value = 1;
    6969      this->saveSettings->saveability();
    7070      execBox->fill(this->saveSettings);
    7171
    72       verboseMode = new Menu("verbose mode", "nothing", "error", "warning", "info", "lastItem");
     72      verboseMode = new Menu(CONFIG_NAME_VERBOSE_MODE, "nothing", "error", "warning", "info", "lastItem");
    7373      verboseMode->setFlagName("verbose", "v", 2);
    7474      verboseMode->saveability();
    7575      execBox->fill(verboseMode);
    7676
    77       alwaysShow = new CheckButton("Always Show this Menu");
     77      alwaysShow = new CheckButton(CONFIG_NAME_ALWAYS_SHOW_GUI);
    7878      alwaysShow->setFlagName("gui", "g", 0);
    7979      alwaysShow->saveability();
  • orxonox/trunk/src/lib/gui/gui/gui_gtk.h

    r4089 r4091  
    1111
    1212#include "debug.h"
     13#include "globals.h"
    1314
    1415#ifdef HAVE_GTK2
  • orxonox/trunk/src/lib/gui/gui/gui_keys.cc

    r4089 r4091  
    5050        PlayerKeys* player2;       //!< The seconds Player's keys.
    5151       
    52         player1 = new PlayerKeys("player1");
    53         player2 = new PlayerKeys("player2");
     52        player1 = new PlayerKeys(CONFIG_SECTION_PLAYER "1");
     53        player2 = new PlayerKeys(CONFIG_SECTION_PLAYER "2");
    5454       
    5555        keysBox1->fill(player1->getOpenButton());
     
    115115
    116116        pKeysBox->setGroupName(player);
    117         pKeysBox->fill(addKey("up", "UP"));
    118         pKeysBox->fill(addKey("down", "DOWN"));
    119         pKeysBox->fill(addKey("left", "LEFT"));
    120         pKeysBox->fill(addKey("right", "RIGHT"));
    121         pKeysBox->fill(addKey("fire", "SPACE"));
     117        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_UP, "UP"));
     118        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_DOWN, "DOWN"));
     119        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "LEFT"));
     120        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "RIGHT"));
     121        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "SPACE"));
     122        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
     123        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_PREV_WEAPON, "n"));
    122124        closeButton = new Button("close");
    123125#ifdef HAVE_GTK2
     
    174176        Button* closeButton;    //!< The CloseButton for this key-settings.
    175177
    176         keysBox->setGroupName("miscKeys");
    177         keysBox->fill(addKey( "quit", "ESCAPE"));
    178         keysBox->fill(addKey("pause", "PAUSE"));
    179         keysBox->fill(addKey("up_world", "x"));
    180         keysBox->fill(addKey("down_world", "z"));
    181         keysBox->fill(addKey("view0", "1"));
    182         keysBox->fill(addKey("view1", "2"));
    183         keysBox->fill(addKey("view2", "3"));
    184         keysBox->fill(addKey("view3", "4"));
    185         keysBox->fill(addKey("view4", "5"));
    186         keysBox->fill(addKey("view5", "6"));
     178        keysBox->setGroupName(CONFIG_SECTION_MISC_KEYS);
     179        keysBox->fill(addKey(CONFIG_NAME_QUIT , "ESCAPE"));
     180        keysBox->fill(addKey(CONFIG_NAME_PAUSE, "PAUSE"));
     181        keysBox->fill(addKey(CONFIG_NAME_NEXT_WORLD, "x"));
     182        keysBox->fill(addKey(CONFIG_NAME_PREV_WORLD, "z"));
     183        keysBox->fill(addKey(CONFIG_NAME_VIEW0, "1"));
     184        keysBox->fill(addKey(CONFIG_NAME_VIEW1, "2"));
     185        keysBox->fill(addKey(CONFIG_NAME_VIEW2, "3"));
     186        keysBox->fill(addKey(CONFIG_NAME_VIEW3, "4"));
     187        keysBox->fill(addKey(CONFIG_NAME_VIEW4, "5"));
     188        keysBox->fill(addKey(CONFIG_NAME_VIEW5, "6"));
    187189
    188190        closeButton = new Button("close");
  • orxonox/trunk/src/lib/gui/gui/gui_update.cc

    r4083 r4091  
    5050
    5151  this->updateFrame = new Frame("Update-Options:");
    52   this->updateFrame->setGroupName("update");
     52  this->updateFrame->setGroupName(CONFIG_SECTION_DATA);
    5353  this->updateBox = new Box('v');
    5454
    55   dataDirButton = new Button("Data Directory");
    56   dataDirLabel = new OptionLabel("DataDir", "unknown");
     55  dataDirButton = new Button(CONFIG_NAME_DATADIR);
     56  dataDirLabel = new OptionLabel(CONFIG_NAME_DATADIR, "unknown");
    5757  dataDirLabel->saveability();
    5858  dataDirDialog = new FileDialog("data-Repos-location");
     
    7070
    7171  // the Button for autoUpdating
    72   this->autoUpdate = new CheckButton("auto update");
     72  this->autoUpdate = new CheckButton(CONFIG_NAME_AUTO_UPDATE);
    7373  this->updateBox->fill(this->autoUpdate);
    7474  this->autoUpdate->setFlagName("update", "u", 0);
  • orxonox/trunk/src/lib/gui/gui/gui_video.cc

    r4068 r4091  
    4949      CheckButton* wireframe;   //!< CheckButton for wireframe Mode.
    5050
    51       fullscreen = new CheckButton("Fullscreen-mode");
     51      fullscreen = new CheckButton(CONFIG_NAME_FULLSCREEN);
    5252      fullscreen->setFlagName("windowed", "q", 1);
    5353      fullscreen->saveability();
    5454      videoBox->fill(fullscreen);
    55       resolution = new Menu("Resolution");
     55      resolution = new Menu(CONFIG_NAME_RESOLUTION);
    5656      getResolutions(resolution);
    5757      resolution->saveability();
    5858      resolution->setFlagName("resolution", "r", 0);
    5959      videoBox->fill(resolution);
    60       wireframe = new CheckButton("WireFrame-mode");
     60      wireframe = new CheckButton(CONFIG_NAME_WIREFRAME);
    6161      wireframe->setFlagName("wireframe", "w", 0);
    6262      wireframe->saveability();
     
    9191  // the Window itself
    9292  advancedWindow = new Window("Advanced Video Options");
    93   advancedWindow->setGroupName("advancedVideoOptions");
     93  advancedWindow->setGroupName(CONFIG_SECTION_VIDEO_ADVANCED);
    9494  {
    9595    Box* advancedBox;         //!< A Box to pack the options into.
     
    111111
    112112      // Advanced Performance Options
    113       shadows = new CheckButton("Shadows");
     113      shadows = new CheckButton(CONFIG_NAME_SHADOWS);
    114114      shadows->saveability();
    115115      advancedBox->fill(shadows);
    116116     
    117       fog = new CheckButton("Fog");
     117      fog = new CheckButton(CONFIG_NAME_FOG);
    118118      fog->saveability();
    119119      advancedBox->fill(fog);
    120120     
    121       reflections = new CheckButton("Reflections");
     121      reflections = new CheckButton(CONFIG_NAME_REFLECTIONS);
    122122      reflections->saveability();
    123123      advancedBox->fill(reflections);
    124124     
    125       textures = new CheckButton("Textures");
     125      textures = new CheckButton(CONFIG_NAME_TEXTURES);
    126126      textures->saveability();
    127127      advancedBox->fill(textures);
    128128     
    129       textureDetail = new Menu("Texture Detail", "low", "medium", "high", "lastItem");
     129      textureDetail = new Menu(CONFIG_NAME_TEXTURE_DETAIL, "low", "medium", "high", "lastItem");
    130130      textureDetail->setDefaultValue(1);
    131131      textureDetail->saveability();
    132132      advancedBox->fill(textureDetail);
    133133     
    134       modelDetailLabel = new Label("Model Detail");
     134      modelDetailLabel = new Label(CONFIG_NAME_MODEL_DETAIL);
    135135      advancedBox->fill(modelDetailLabel);
    136       modelDetail = new Menu("Model Detail", "low", "high", "lastItem");
     136      modelDetail = new Menu(CONFIG_NAME_MODEL_DETAIL, "low", "high", "lastItem");
    137137      modelDetail->setDefaultValue(1);
    138138      modelDetail->saveability();
     
    141141      antiAliasingLabel = new Label("Anti-Aliasing-depth:");
    142142      advancedBox->fill(antiAliasingLabel);
    143       antiAliasing = new Menu("Anti Aliasing", "0", "1", "2", "4", "8",  "lastItem");
     143      antiAliasing = new Menu(CONFIG_NAME_ANTI_ALIASING, "0", "1", "2", "4", "8",  "lastItem");
    144144      antiAliasing->setDefaultValue(2);
    145145      antiAliasing->saveability();
     
    148148      filterMethodLabel = new Label("Filtering Method:");
    149149      advancedBox->fill(filterMethodLabel);
    150       filterMethod = new Menu("Filtering Method", "none", "linear", "bilinear", "trilinear", "anisortopic", "lastItem");
     150      filterMethod = new Menu(CONFIG_NAME_FILTER_METHOD, "none", "linear", "bilinear", "trilinear", "anisortopic", "lastItem");
    151151      filterMethod->setDefaultValue(1);
    152152      filterMethod->saveability();
Note: See TracChangeset for help on using the changeset viewer.