Rapatriement dans la branche 0.3 de toutes les modifications effectuees dans le trunk depuis la creation de la branche 0.3.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@793 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2009-11-22 16:12:22 +00:00
parent 22ebec4dad
commit 121bd1f432
247 changed files with 17529 additions and 3671 deletions

View File

@@ -43,11 +43,14 @@ class ConductorPropertiesWidget : public QWidget {
private:
void setConductorType(ConductorProperties::ConductorType);
void setColorButton(const QColor &);
QColor colorButton() const;
public slots:
void updatePreview();
void updateConfig();
void updateDisplay();
void chooseColor();
// attributs prives
private:
@@ -62,6 +65,8 @@ class ConductorPropertiesWidget : public QWidget {
QCheckBox *ground_checkbox;
QCheckBox *neutral_checkbox;
QLabel *preview;
QPushButton *color_button;
QCheckBox *dashed_checkbox;
ConductorProperties properties_;