[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [brprint3d] /: Remove Option
From: Lays Rodrigues <laysrodriguessilva () gmail ! com>
Date: 2015-12-01 1:35:01
Message-ID: E1a3ZqP-0000XT-OT () scm ! kde ! org
[Download RAW message or body]
Git commit 693e49b4af7af6481b269ac2ba350204ca923083 by Lays Rodrigues.
Committed on 01/12/2015 at 01:25.
Pushed by laysrodrigues into branch 'master'.
Remove Option
Remove the option reset on emergency, because if
the button stop on emergency is clicked, the printer
resets automatically.
Signed-off-by: Lays Rodrigues <laysrodriguessilva@gmail.com>
M +76 -90 PrinterSettingsWidget.ui
http://commits.kde.org/brprint3d/693e49b4af7af6481b269ac2ba350204ca923083
diff --git a/PrinterSettingsWidget.ui b/PrinterSettingsWidget.ui
index 54d9ece..199f316 100755
--- a/PrinterSettingsWidget.ui
+++ b/PrinterSettingsWidget.ui
@@ -91,22 +91,8 @@
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="lb_Connection">
- <property name="text">
- <string>Connection:</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="lb_ResetE">
- <property name="text">
- <string>Reset on Emergency:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="cb_ConnectionType">
+ <item row="1" column="1" colspan="2">
+ <widget class="QComboBox" name="cb_ConnectionPort">
<property name="minimumSize">
<size>
<width>120</width>
@@ -119,17 +105,14 @@
<height>25</height>
</size>
</property>
- <property name="locale">
- <locale language="Portuguese" country="Brazil"/>
- </property>
<item>
<property name="text">
- <string>USB</string>
+ <string>/dev/ttyACM0</string>
</property>
</item>
<item>
<property name="text">
- <string>Serial</string>
+ <string>/dev/ttyUSB0</string>
</property>
</item>
</widget>
@@ -141,6 +124,13 @@
</property>
</widget>
</item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="lb_Protocol">
+ <property name="text">
+ <string>Firmware:</string>
+ </property>
+ </widget>
+ </item>
<item row="5" column="0">
<widget class="QLabel" name="lb_ResetC">
<property name="text">
@@ -155,15 +145,8 @@
</property>
</widget>
</item>
- <item row="6" column="1">
- <widget class="QCheckBox" name="ck_ResetOnEmergency">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QComboBox" name="cb_Firmware">
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cb_ConnectionType">
<property name="minimumSize">
<size>
<width>120</width>
@@ -176,27 +159,30 @@
<height>25</height>
</size>
</property>
+ <property name="locale">
+ <locale language="Portuguese" country="Brazil"/>
+ </property>
<item>
<property name="text">
- <string>Repetier</string>
+ <string>USB</string>
</property>
</item>
<item>
<property name="text">
- <string>Marlin</string>
+ <string>Serial</string>
</property>
</item>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="lb_Cache">
+ <item row="7" column="0">
+ <widget class="QLabel" name="lb_log">
<property name="text">
- <string>Cache size:</string>
+ <string>Printer Log:</string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QComboBox" name="cb_CacheSize">
+ <item row="2" column="1">
+ <widget class="QComboBox" name="cb_TransmitionRate">
<property name="minimumSize">
<size>
<width>120</width>
@@ -211,27 +197,38 @@
</property>
<item>
<property name="text">
- <string>127</string>
+ <string>115200</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>4800</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>9600</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>19200</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>38400</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>57600</string>
</property>
</item>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="lb_Protocol">
- <property name="text">
- <string>Firmware:</string>
- </property>
- </widget>
- </item>
- <item row="8" column="0">
- <widget class="QLabel" name="lb_log">
- <property name="text">
- <string>Printer Log:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QComboBox" name="cb_ConnectionPort">
+ <item row="3" column="1">
+ <widget class="QComboBox" name="cb_Firmware">
<property name="minimumSize">
<size>
<width>120</width>
@@ -246,25 +243,32 @@
</property>
<item>
<property name="text">
- <string>/dev/ttyACM0</string>
+ <string>Repetier</string>
</property>
</item>
<item>
<property name="text">
- <string>/dev/ttyUSB0</string>
+ <string>Marlin</string>
</property>
</item>
</widget>
</item>
- <item row="8" column="1">
+ <item row="2" column="0">
+ <widget class="QLabel" name="lb_Transmission">
+ <property name="text">
+ <string>Transmission Rate:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
<widget class="QCheckBox" name="ck_PrintLog">
<property name="text">
<string/>
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QComboBox" name="cb_TransmitionRate">
+ <item row="4" column="1">
+ <widget class="QComboBox" name="cb_CacheSize">
<property name="minimumSize">
<size>
<width>120</width>
@@ -279,44 +283,19 @@
</property>
<item>
<property name="text">
- <string>115200</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>4800</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>9600</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>19200</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>38400</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>57600</string>
+ <string>127</string>
</property>
</item>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="lb_Transmission">
+ <item row="4" column="0">
+ <widget class="QLabel" name="lb_Cache">
<property name="text">
- <string>Transmission Rate:</string>
+ <string>Cache size:</string>
</property>
</widget>
</item>
- <item row="9" column="0">
+ <item row="8" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -329,6 +308,13 @@
</property>
</spacer>
</item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="lb_Connection">
+ <property name="text">
+ <string>Connection:</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
@@ -638,7 +624,7 @@
<resources>
<include location="resources.qrc"/>
<include location="resources.qrc"/>
- <include location="images.qrc"/>
+ <include location="resources.qrc"/>
</resources>
<connections/>
</ui>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic