Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def __init__(self,parent=None):
self.setLayout(detailLayout)

class Preferences(QDialog):
def __init__(self,parent=None):
def __init__(self,serialWidget,parent=None):
super(Preferences,self).__init__(parent)
self.widget=QWidget()
layout=QGridLayout(self.widget)
Expand All @@ -126,7 +126,7 @@ def __init__(self,parent=None):

tabWidget=QTabWidget()
tabWidget.setTabPosition(QTabWidget.West);
tabWidget.addTab(SerialWidget(self),"Serial")
tabWidget.addTab(serialWidget,"Serial")
tabWidget.addTab(self.landlocation,"Languare Location")
tabWidget.addTab(self.configUpdate,"config")
layout.addWidget(tabWidget,1,0)
Expand Down
4 changes: 2 additions & 2 deletions graphicsInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def __init__(self,parent=None):
self.setLayout(detailLayout)

class Preferences(QDialog):
def __init__(self,parent=None):
def __init__(self,serialWidget,parent=None):
super(Preferences,self).__init__(parent)
self.setWindowFlags(Qt.WindowCloseButtonHint)#HelpButtonHint?
self.setStyleSheet("""QDialog{background-color: rgb(236, 236, 236);color:black;}
Expand All @@ -264,7 +264,7 @@ def __init__(self,parent=None):
tabWidget.setTabPosition(QTabWidget.North);
tabWidget.addTab(self.configUpdate,"config")
tabWidget.addTab(self.landlocation,"Languare Location")
tabWidget.addTab(SerialWidget(self),"Serial")
tabWidget.addTab(serialWidget,"Serial")

layout.addWidget(tabWidget,1,0)
self.setLayout(layout)
Expand Down
2 changes: 1 addition & 1 deletion uPyCraft.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def __init__(self,parent=None):
#create graphics interface
self.createGraphicsInterface()
#create Preferences
self.preferencesDialog=Preferences()
self.preferencesDialog=Preferences(self.myserial)

#thread

Expand Down