Skip to content

Commit 4919972

Browse files
Removed Create Connect button and Create Connected State Label
1 parent 0b67367 commit 4919972

File tree

2 files changed

+4
-83
lines changed

2 files changed

+4
-83
lines changed

src/Create3Widget.cpp

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent)
3939
ui->setupUi(this);
4040
performStandardSetup(tr("Create 3"), false);
4141
setStyleSheet("QScrollBar:vertical {border: 2px solid grey;background:grey ;width: 100px; margin: 22px 0 22px 0; } QScrollBar::handle:vertical { border: 2px solid grey;background: white; min-height: 20px; } QScrollBar::add-line:vertical { border: 2px solid grey;background: #32CC99; height: 20px; subcontrol-position: bottom; subcontrol-origin: margin; } QScrollBar::sub-line:vertical {border: 2px solid grey; background: #32CC99; height: 20px; subcontrol-position: top; subcontrol-origin: margin; } QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical { border: 2px solid grey;width: 3px; height: 3px; background: white; }QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {border: 2px solid grey; background: none;}");
42-
connect(ui->CreateConnectButton, SIGNAL(clicked()), SLOT(create3Connect()));
43-
// connect(ui->ResetServerButton, SIGNAL(clicked()), SLOT(resetServer()));
42+
4443
connect(ui->Create3SensorListButton, SIGNAL(clicked()), SLOT(sensorList()));
4544
connect(ui->Create3ExampleProgramButton, SIGNAL(clicked()), SLOT(exampleList()));
4645

@@ -69,19 +68,7 @@ Create3Widget::Create3Widget(Device *device, QWidget *parent)
6968

7069
connect(ui->toggleSwitch, SIGNAL(stateChanged(int)), this, SLOT(toggleChanged()));
7170

72-
if(ui->create3IP->text() == ""){
73-
ui->CreateConnectButton->setEnabled(false);
74-
ui->Create3SensorListButton->setEnabled(false);
75-
ui->Create3ExampleProgramButton->setEnabled(false);
76-
ui->toggleSwitch->setEnabled(false);
77-
}
78-
else{
79-
ui->CreateConnectButton->setEnabled(true);
80-
ui->Create3SensorListButton->setEnabled(true);
81-
ui->Create3ExampleProgramButton->setEnabled(true);
82-
ui->toggleSwitch->setEnabled(true);
8371

84-
}
8572
}
8673

8774
Create3Widget::~Create3Widget()
@@ -93,7 +80,7 @@ void Create3Widget::toggleChanged()
9380
{
9481

9582
StandardWidget::disableMenuBar();
96-
ui->CreateConnectButton->setEnabled(false);
83+
9784
ui->toggleSwitch->setEnabled(false);
9885
ui->Create3SensorListButton->setEnabled(false);
9986
ui->Create3ExampleProgramButton->setEnabled(false);
@@ -120,7 +107,6 @@ void Create3Widget::toggleChanged()
120107

121108
StandardWidget::enableMenuBar();
122109
ui->toggleSwitch->setChecked(false); //Wifi toggle side
123-
ui->CreateConnectButton->setEnabled(true);
124110
ui->toggleSwitch->setEnabled(true);
125111
ui->Create3SensorListButton->setEnabled(true);
126112
ui->Create3ExampleProgramButton->setEnabled(true);
@@ -142,7 +128,6 @@ void Create3Widget::toggleChanged()
142128

143129
StandardWidget::enableMenuBar();
144130
ui->toggleSwitch->setChecked(true); //Ethernet toggle side
145-
ui->CreateConnectButton->setEnabled(true);
146131
ui->toggleSwitch->setEnabled(true);
147132
ui->Create3SensorListButton->setEnabled(true);
148133
ui->Create3ExampleProgramButton->setEnabled(true);
@@ -218,11 +203,11 @@ void Create3Widget::create3Connect()
218203
if (connected == 1)
219204
{
220205
qDebug() << "Create connected";
221-
ui->createConnectState->setText("Connected");
206+
222207
}
223208
else
224209
{
225210
qDebug() << "Create not connected";
226-
ui->createConnectState->setText("Not Connected");
211+
227212
}
228213
}

ui/Create3Widget.ui

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -30,39 +30,6 @@
3030
<property name="leftMargin">
3131
<number>0</number>
3232
</property>
33-
<item alignment="Qt::AlignLeft">
34-
<widget class="QPushButton" name="CreateConnectButton">
35-
<property name="enabled">
36-
<bool>true</bool>
37-
</property>
38-
<property name="sizePolicy">
39-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
40-
<horstretch>0</horstretch>
41-
<verstretch>0</verstretch>
42-
</sizepolicy>
43-
</property>
44-
<property name="minimumSize">
45-
<size>
46-
<width>1</width>
47-
<height>80</height>
48-
</size>
49-
</property>
50-
<property name="maximumSize">
51-
<size>
52-
<width>16777215</width>
53-
<height>16777215</height>
54-
</size>
55-
</property>
56-
<property name="font">
57-
<font>
58-
<pointsize>33</pointsize>
59-
</font>
60-
</property>
61-
<property name="text">
62-
<string>Create Connect</string>
63-
</property>
64-
</widget>
65-
</item>
6633
<item>
6734
<layout class="QHBoxLayout" name="horizontalLayout">
6835
<property name="spacing">
@@ -162,37 +129,6 @@ QCheckBox::indicator:unchecked{
162129
</item>
163130
</layout>
164131
</item>
165-
<item>
166-
<layout class="QHBoxLayout" name="CreateConnectHorizontal">
167-
<item>
168-
<widget class="QLabel" name="createConnectLabel">
169-
<property name="font">
170-
<font>
171-
<pointsize>22</pointsize>
172-
</font>
173-
</property>
174-
<property name="text">
175-
<string>Create3 Connected State:</string>
176-
</property>
177-
</widget>
178-
</item>
179-
<item>
180-
<widget class="QLabel" name="createConnectState">
181-
<property name="font">
182-
<font>
183-
<pointsize>22</pointsize>
184-
</font>
185-
</property>
186-
<property name="text">
187-
<string/>
188-
</property>
189-
<property name="alignment">
190-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
191-
</property>
192-
</widget>
193-
</item>
194-
</layout>
195-
</item>
196132
<item>
197133
<layout class="QHBoxLayout" name="IPHorizontal">
198134
<item>

0 commit comments

Comments
 (0)