Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:
trunk/src/lib/gui
Files:
3 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/gui/gl/Makefile.am

    r8973 r9406  
    1313                \
    1414                glgui_handler.cc \
    15                 signal_connector.cc \
    1615                glgui_mainwidget.cc \
    1716                glgui_widget.cc \
    … …  
    3837                glmenu/glmenu_imagescreen.h \
    3938                \
    40                 signal_connector.h \
    4139                glgui.h \
    4240                glgui_defs.h \

  • trunk/src/lib/gui/gl/glgui_button.cc

    r8769 r9406  
    7979  {
    8080    GLGuiWidget::clicking(pos);
    81     emit(clicked());
     81    clicked.emit();
    8282  }
    8383  void GLGuiButton::releasing(const Vector2D& pos, bool focused)
    8484  {
    8585    GLGuiWidget::releasing(pos, focused);
    86     emit(released());
     86    released.emit();
    8787  }
    8888
    … …  
    103103    {
    104104      if (event.bPressed)
    105         emit(pushed());
     105        clicked.emit();
    106106      else
    107         emit(released());
     107        released.emit();
    108108      return true;
    109109    }

  • trunk/src/lib/gui/gl/glgui_button.h

    r8717 r9406  
    4242      virtual bool processEvent(const Event& event);
    4343
    44       DeclareSignal0(clicked);
    45       DeclareSignal0(released);
     44      sigslot::signal0<> clicked;
     45      sigslot::signal0<> released;
    4646
    4747

  • trunk/src/lib/gui/gl/glgui_checkbutton.cc

    r8717 r9406  
    5555  {
    5656    this->bActive = bActive;
    57     emit(this->toggled(this->bActive));
     57    this->toggled.emit(this->bActive);
    5858  }
    5959

  • trunk/src/lib/gui/gl/glgui_checkbutton.h

    r8717 r9406  
    3434    virtual void update() {};
    3535
    36     DeclareSignal1(toggled, bool);
     36    sigslot::signal1<bool> toggled;
    3737
    3838  protected:

  • trunk/src/lib/gui/gl/glgui_frame.cc

    r8145 r9406  
    5757    else
    5858    {
    59       PRINTF(2)("Frame %s is already filled, not filling with %s\n", this->getName(), widget->getName());
     59      PRINTF(2)("Frame %s is already filled, not filling with %s\n", this->getCName(), widget->getCName());
    6060    }
    6161  }

  • trunk/src/lib/gui/gl/glgui_image.h

    r8448 r9406  
    3434    virtual void draw() const;
    3535
    36     DeclareSignal0(imageChanged);
     36    sigslot::signal0<> imageChanged;
    3737
    3838  protected:

  • trunk/src/lib/gui/gl/glgui_inputline.cc

    r8717 r9406  
    124124    this->resize();
    125125    this->setFrontColor(Color(1,1,1,1), true);
    126     emit(this->textChanged(this->_text.text()));
     126    this->textChanged.emit(this->_text.text());
    127127  }
    128128
    … …  
    146146  void GLGuiInputLine::pushEnter()
    147147  {
    148     emit(this->enterPushed(this->_text.text()));
     148    this->enterPushed.emit(this->_text.text());
    149149    if (this->_clearOnEnter)
    150150      this->clear();

  • trunk/src/lib/gui/gl/glgui_inputline.h

    r8619 r9406  
    4949    virtual bool processEvent(const Event& event);
    5050
    51     DeclareSignal1(textChanged, const std::string&);
    52     DeclareSignal1(enterPushed, const std::string&);
     51    sigslot::signal1<const std::string&> textChanged;
     52    sigslot::signal1<const std::string&> enterPushed;
    5353
    5454  protected:

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

    r8717 r9406  
    7777    this->_handle.setCenter(this->sliderPosition(), borderTop() + (this->getSizeY2D() - borderTop() - borderBottom()) / 2.0);
    7878
    79     emit(valueChanged(this->_value));
     79    valueChanged.emit(this->_value);
    8080  }
    8181
    … …  
    9090    {
    9191      this->_minValue = minimum;
    92       emit(rangeChanged(this->_minValue, this->_maxValue));
     92      rangeChanged.emit(this->_minValue, this->_maxValue);
    9393    }
    9494    if (this->value() < this->min())
    … …  
    107107    {
    108108      this->_maxValue = maximum;
    109       emit(rangeChanged(this->_minValue, this->_maxValue));
     109      rangeChanged.emit(this->_minValue, this->_maxValue);
    110110    }
    111111    if (this->value() > this->max())
    … …  
    126126      this->_minValue = minimum;
    127127      this->_maxValue = maximum;
    128       emit(rangeChanged(this->_minValue, this->_maxValue));
     128      rangeChanged.emit(this->_minValue, this->_maxValue);
    129129    }
    130130    if (this->value() < this->min())

  • trunk/src/lib/gui/gl/glgui_slider.h

    r8717 r9406  
    5151    virtual void draw() const;
    5252
    53     DeclareSignal1(valueChanged, float);
    54     DeclareSignal2(rangeChanged, float, float);
     53    sigslot::signal1<float> valueChanged;
     54    sigslot::signal2<float, float> rangeChanged;
    5555
    5656  protected:

  • trunk/src/lib/gui/gl/glgui_text.cc

    r8991 r9406  
    113113    this->resize();
    114114    this->setFrontColor(_changedTextColor, true);
    115     emit(this->textChanged(this->_text.text()));
     115    this->textChanged.emit(this->_text.text());
    116116  }
    117117

  • trunk/src/lib/gui/gl/glgui_text.h

    r8991 r9406  
    3333    void setChangedTextColor(const Color& color);
    3434
     35    void setLineWidth(float lineWidth) { this->_text.setLineWidth(lineWidth); };
    3536    void setDotsPosition(LimitedWidthText::DotsPosition dotsPosition) { this->_text.setDotsPosition(dotsPosition); };
    3637
    … …  
    4041    virtual void draw() const;
    4142
    42     DeclareSignal1(textChanged, const std::string&);
     43    sigslot::signal1<const std::string&> textChanged;
    4344
    4445  protected:

  • trunk/src/lib/gui/gl/glgui_textfield.cc

    r9015 r9406  
    112112    this->resize();
    113113    this->setFrontColor(_changedTextColor, true);
    114     emit(this->textChanged(this->_text.text()));
     114    this->textChanged.emit(this->_text.text());
    115115  }
    116116

  • trunk/src/lib/gui/gl/glgui_textfield.h

    r9015 r9406  
    3838    virtual void draw() const;
    3939
    40     DeclareSignal1(textChanged, const std::string&);
     40    sigslot::signal1<const std::string&> textChanged;
    4141
    4242  protected:

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

    r9019 r9406  
    288288    this->setWidgetSize(Vector2D(x, y));
    289289  }
    290 
    291 
    292 
    293   void GLGuiWidget::connect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver, Slot executor)
    294   {
    295     sender->connect(signal, receiver, executor);
    296   }
    297 
    298   void GLGuiWidget::connect(Signal& signal, BaseObject* receiver, Slot executor)
    299   {
    300     signal.push_back(SignalConnector(receiver, executor));
    301   }
    302 
    303290
    304291  void GLGuiWidget::show()
    … …  
    806793    //this->_currentStyle = this->_style[state];
    807794    this->_state = state;
    808     PRINTF(4)("%s::%s Switches to state %s\n", this->getClassName(), this->getName(), OrxGui::StateString[state].c_str());
     795    PRINTF(4)("%s::%s Switches to state %s\n", this->getClassCName(), this->getCName(), OrxGui::StateString[state].c_str());
    809796
    810797    this->animateBack();
    … …  
    874861  void GLGuiWidget::debug(unsigned int level) const
    875862  {
    876     PRINT(0)("Debug of %s::%s - WidgetPart ", this->getClassName(), this->getName());
     863    PRINT(0)("Debug of %s::%s - WidgetPart ", this->getClassCName(), this->getCName());
    877864    if (_parent != NULL)
    878       PRINT(0)("- Parent %s::%s ", _parent->getClassName(), _parent->getName());
     865      PRINT(0)("- Parent %s::%s ", _parent->getClassCName(), _parent->getCName());
    879866    PRINT(0)("- State: %s", StateString[_state].c_str());
    880867

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

    r8990 r9406  
    1717
    1818#include "event.h"
    19 #include "signal_connector.h"
     19#include "sigslot/signal.h"
    2020
    2121namespace OrxGui
    … …  
    7070    void release(const Vector2D& pos);
    7171    bool clickable() const { return this->_clickable; };
    72 
    73     static void connect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver, Slot executor);
    74     void connect(Signal& signal, BaseObject* receiver, Slot executor);
    75 
    76     void disconnect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver);
    7772
    7873    OrxGui::State state() const { return this->_state; };

  • trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc

    r8316 r9406  
    2727CREATE_FACTORY(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
    2828
    29 using namespace std;
     29
    3030/**
    3131 * @param root The Element to load the GLMenu from

  • trunk/src/lib/gui/gui_saveable.cc

    r8362 r9406  
    6060  void Saveable::load()
    6161  {
    62     this->value() = Preferences::getInstance()->getMultiType(this->group->getName(), this->getName(), this->_defaultValue);
    63     PRINTF(4)("Loaded to '%s' of group '%s' value '%s'\n", this->getName(), this->group->getName(), this->value().getCString());
     62    this->value() = Preferences::getInstance()->getMultiType(this->group->getCName(), this->getCName(), this->_defaultValue);
     63    PRINTF(4)("Loaded to '%s' of group '%s' value '%s'\n", this->getCName(), this->group->getCName(), this->value().getCString());
    6464  }
    6565
    6666  void Saveable::save()
    6767  {
    68     Preferences::getInstance()->setMultiType(this->group->getName(), this->getName(), this->value() );
    69     PRINTF(4)("Saved to '%s' of group '%s' value '%s'\n", this->getName(), this->group->getName(), this->value().getCString());
     68    Preferences::getInstance()->setMultiType(this->group->getCName(), this->getCName(), this->value() );
     69    PRINTF(4)("Saved to '%s' of group '%s' value '%s'\n", this->getCName(), this->group->getCName(), this->value().getCString());
    7070  }
    7171

  • trunk/src/lib/gui/qt/gui_video.cc

    r8362 r9406  
    5050      layout->addWidget(fullscreen, 0, 0);
    5151
     52      QtGuiCheckBox* dedicated = new QtGuiCheckBox(CONFIG_NAME_NO_RENDER, this, false);
     53      //fullscreen->setName();
     54      layout->addWidget(dedicated, 1, 0);
     55
    5256      QtGuiCheckBox* wireframe = new QtGuiCheckBox(CONFIG_NAME_WIREFRAME, this, false);
    53       layout->addWidget(wireframe, 1, 0);
     57      layout->addWidget(wireframe, 2, 0);
    5458
    5559      {
    5660        QComboBox* resolution = new QtGuiComboBox(CONFIG_NAME_RESOLUTION, this, "640x480");
    5761        resolution->setEditable(true);
    58         layout->addWidget(resolution, 2, 0);
     62        layout->addWidget(resolution, 3, 0);
    5963        std::vector<QString> resolutions;
    6064        this->getResolutions(resolutions);
Note: See TracChangeset for help on using the changeset viewer.