Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8140 in orxonox.OLD


Ignore:
Timestamp:
Jun 4, 2006, 12:36:45 AM (18 years ago)
Author:
bensch
Message:

gui: shorter paths for different guis

Location:
branches/gui
Files:
9 edited
3 moved

Legend:

Unmodified
Added
Removed

  • branches/gui/configure.ac

    r8061 r8140  
    526526  AX_CHECK_REQUIRED_HEADER_LIB([avformat.h ffmpeg/avformat.h] ,[avformat], [main],
    527527   [AX_CHECK_REQUIRED_HEADER_LIB([avcodec.h ffmpeg/avcodec.h], [avcodec], [main],,, [http://ffmpeg.sourceforge.net]) LIBS="${LIBS} -lavformat -lavcodec"],
    528    [AX_GET_INSTALL_NECESSARY_LIB([http://svn.orxonox.net/webdev/develop/ext_libs], [ffmpeg.tar.gz], [ffmpeg], [extern_libs/], [include/*.h lib/*.a])
     528     [AX_GET_INSTALL_NECESSARY_LIB([http://svn.orxonox.net/webdev/develop/ext_libs], [ffmpeg.tar.gz], [ffmpeg], [extern_libs/], [include/*.h lib/*.a])
    529529       LIBS="-llualib -llua"  CPPFLAGS="${CPPFLAGS} -I$(top_build_dir)/extern_libs" ],
    530530  [http://ffmpeg.sourceforge.net])
     531
     532
    531533
    532534
    … …  
    625627                 src/lib/shell/Makefile
    626628                 src/lib/gui/Makefile
    627                  src/lib/gui/gtk_gui/Makefile
    628                  src/lib/gui/gl_gui/Makefile
    629                  src/lib/gui/qt_gui/Makefile
     629                 src/lib/gui/gtk/Makefile
     630                 src/lib/gui/gl/Makefile
     631                 src/lib/gui/qt/Makefile
    630632                 src/lib/script_engine/Makefile
    631633                 src/lib/parser/Makefile

  • branches/gui/src/defs/include_paths.am

    r7927 r8140  
    1212AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/render2D
    1313AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/particles
    14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gtk_gui
    15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl_gui
    16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl_gui/glmenu
     14AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl
     15AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gl/glmenu
    1716AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    1817AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/shell

  • branches/gui/src/lib/BuildLibs.am

    r7954 r8140  
    33                $(LIB_PREFIX)/libORXlibs.a \
    44                $(LIB_PREFIX)/shell/libORXshell.a \
    5                 $(LIB_PREFIX)/gui/qt_gui/libORXqtgui.a \
    6                 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \
     5                $(LIB_PREFIX)/gui/qt/libORXqtgui.a \
     6                $(LIB_PREFIX)/gui/gl/libORXglgui.a \
    77                $(LIB_PREFIX)/gui/libORXbasegui.a \
    88                $(LIB_PREFIX)/graphics/importer/libORXimporter.a \

  • branches/gui/src/lib/gui/Makefile.am

    r7661 r8140  
    2323SUBDIRS = \
    2424        . \
    25         gl_gui \
    26         qt_gui
     25        gl \
     26        qt
    2727
    2828#       gtk_gui

  • branches/gui/src/lib/gui/gl/glgui_slider.cc

    r8117 r8140  
    161161  {
    162162    GLGuiWidget::resize();
    163     this->frontRect().setTopLeft(5, this->getSizeY2D()/2.0 - 2.0);
    164     this->frontRect().setSize(this->getSizeX2D() - 10.0, 4.0);
     163    this->frontRect().setTopLeft(this->borderLeft(), this->getSizeY2D()/2.0 - 2.0);
     164    this->frontRect().setSize(this->getSizeX2D() - borderLeft() - borderRight(), 4.0);
    165165  }
    166166
    … …  
    231231    this->drawRect(this->frontRect());
    232232
    233     this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, borderTop(), _sliderWidth, this->getSizeY2D() - (borderTop() + borderBottom())));
     233    this->drawRect(Rect2D(this->sliderPosition()-_sliderWidth/2.0, 0*this->borderTop(), _sliderWidth, this->getSizeY2D() - (borderTop() + borderBottom()) +20));
    234234
    235235    this->endDraw();

  • branches/gui/src/lib/gui/gl/glgui_widget.cc

    r8118 r8140  
    7171    this->_borderLeft = 1.0;
    7272    this->_borderRight = 1.0;
    73     this->_borderTop = 1.0;
     73    this->_borderTop = 20.0;
    7474    this->_borderBottom = 1.0;
    7575  }

  • branches/gui/src/lib/gui/gl/glgui_widget.h

    r8115 r8140  
    160160    float                          _borderBottom;
    161161
     162    Vector2D                       _minSize;
     163
    162164    /// EVENTS
    163165    bool                           _focusable;        //!< If this widget can receive focus.

  • branches/gui/src/lib/math/rect2D.cc

    r7919 r8140  
    3636Rect2D::Rect2D(float x, float y, float width, float height)
    3737{
    38   this->setLeft(x), this->setTop(y);
     38  this->setLeft(x),
     39  this->setTop(y);
    3940  this->setSize(width, height);
    4041}

  • branches/gui/src/orxonox.cc

    r7954 r8140  
    3030#include "globals.h"
    3131
    32 #include "gui/qt_gui/qt_gui.h"
     32#include "gui/qt/qt_gui.h"
    3333
    3434#include "file.h"
Note: See TracChangeset for help on using the changeset viewer.