[Uludag-commits] r15323 - trunk/staj-projeleri/scanner/src
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
5 Eyl 2007 Çar 17:03:36 EEST
Author: baris.daylik
Date: Wed Sep 5 17:03:35 2007
New Revision: 15323
Modified:
trunk/staj-projeleri/scanner/src/combobox.py
trunk/staj-projeleri/scanner/src/option.py
trunk/staj-projeleri/scanner/src/options.py
Log:
Modified: trunk/staj-projeleri/scanner/src/combobox.py
=================================================================
--- trunk/staj-projeleri/scanner/src/combobox.py (original)
+++ trunk/staj-projeleri/scanner/src/combobox.py Wed Sep 5 17:03:35 2007
@@ -10,16 +10,19 @@
# self.insertItem(repr(c))
# self.connect(self,SIGNAL("activated(int)"),self.activatedAction)
- def __init__(self,rw,parent,name,option,device):
+ def __init__(self,title,rw,parent,name,option=None,device=None):
QHBox.__init__(self,parent,name)
-
- self.label = QLabel(option.title,self,option.title)
+
+ self.label = QLabel(title,self,title)
self.comboBox = QComboBox(rw,self,name)
self.option = option
self.device = device
- for c in self.option.constraint:
- self.comboBox.insertItem(repr(c))
- self.updateState()
+ if self.option == None:
+ self.setEnabled(False)
+ else:
+ for c in self.option.constraint:
+ self.comboBox.insertItem(repr(c))
+ self.updateState()
self.connect(self.comboBox,SIGNAL("activated(int)"),self.activatedAction)
def activatedAction(self,i):
Modified: trunk/staj-projeleri/scanner/src/option.py
=================================================================
--- trunk/staj-projeleri/scanner/src/option.py (original)
+++ trunk/staj-projeleri/scanner/src/option.py Wed Sep 5 17:03:35 2007
@@ -23,21 +23,21 @@
self.widget = CheckBox(self.deviceOption.title,parent,"checkbox",self.deviceOption,self.device)
elif self.deviceOption.type == sane.TYPE_INT:
if isinstance(self.deviceOption.constraint,list):
- self.widget = ComboBox(False,parent,"combobox",self.deviceOption,self.device)
+ self.widget = ComboBox(self.deviceOption.title,False,parent,"combobox",self.deviceOption,self.device)
elif isinstance(self.deviceOption.constraint,tuple):
self.widget = Slider(Qt.Horizontal,parent,"slider",self.deviceOption,self.device)
elif self.deviceOption.constraint == None:
self.widget = LineEdit(parent,"lineedit",self.deviceOption,self.device);
elif self.deviceOption.type == sane.TYPE_FIXED:
if isinstance(self.deviceOption.constraint,list):
- self.widget = ComboBox(False,parent,"combobox",self.deviceOption,self.device)
+ self.widget = ComboBox(self.deviceOption.title,False,parent,"combobox",self.deviceOption,self.device)
elif isinstance(self.deviceOption.constraint,tuple):
self.widget = Slider(Qt.Horizontal,parent,"slider",self.deviceOption,self.device)
elif self.deviceOption.constraint == None:
self.widget = LineEdit(parent,"lineedit",self.deviceOption,self.device)
elif self.deviceOption.type == sane.TYPE_STRING:
if isinstance(self.deviceOption.constraint,list):
- self.widget = ComboBox(False,parent,"combobox",self.deviceOption,self.device)
+ self.widget = ComboBox(self.deviceOption.title,False,parent,"combobox",self.deviceOption,self.device)
elif self.deviceOption.constraint == None:
self.widget = LineEdit(parent,"lineedit",self.deviceOption,self.device)
else:
Modified: trunk/staj-projeleri/scanner/src/options.py
=================================================================
--- trunk/staj-projeleri/scanner/src/options.py (original)
+++ trunk/staj-projeleri/scanner/src/options.py Wed Sep 5 17:03:35 2007
@@ -5,6 +5,8 @@
from labeledline import *
from option import *
from optionsthread import *
+from combobox import *
+
class Options(QWidget):
def __init__(self,parent):
@@ -21,15 +23,14 @@
self.tabWidget.setMaximumSize(QSize(350,32767))
self.hLayout.addWidget(self.tabWidget)
- self.tab = QScrollView(self.tabWidget,"scrollView")
- self.tabViewport = QWidget(self.tab.viewport(),"tab")
+ self.advancedTab = QScrollView(self.tabWidget,"scrollView")
+ self.tabViewport = QWidget(self.advancedTab.viewport(),"advancedTab")
self.tabViewport.setMinimumWidth(328);
- #self.tabViewport.setSizePolicy(QSizePolicy(QSizePolicy.Expanding,QSizePolicy.Expanding,0,0,self.tabWidget.sizePolicy().hasHeightForWidth()))
- self.tab.viewport().setPaletteBackgroundColor(self.tabViewport.paletteBackgroundColor())
- self.tab.viewport().setPaletteForegroundColor(QColor(0,0,0))
+ self.advancedTab.viewport().setPaletteBackgroundColor(self.tabViewport.paletteBackgroundColor())
+ self.advancedTab.viewport().setPaletteForegroundColor(QColor(0,0,0))
self.tabLayout = QVBoxLayout(self.tabViewport)
- self.tab.addChild(self.tabViewport)
+ self.advancedTab.addChild(self.tabViewport)
self.devices = sane.get_devices()
@@ -46,21 +47,35 @@
self.connect(self.deviceSelect,SIGNAL("activated(int)"),self.deviceSelected)
+ self.basicOptionsBox = QGroupBox(1,Qt.Horizontal,"Basic Options",self.tabViewport,"basicOptionsBox")
+ self.basicOptionsBox.setFlat(True)
+ self.tabLayout.addWidget(self.basicOptionsBox)
+
+ self.scanMode = ComboBox("Scan Mode",False,self.basicOptionsBox,"combobox")
+
+ self.resolution = ComboBox("Resolution",False,self.basicOptionsBox,"combobox")
+
+ self.showAdvancedButton = QButton(self.tabViewport,"showAdvancedButton")
+ self.showAdvancedButton.setText("More")
+ self.tabLayout.addWidget(self.showAdvancedButton)
+
+
+ self.connect(self.showAdvancedButton,SIGNAL("released()"),self.showMore)
+
self.opt = None
- self.tabWidget.insertTab(self.tab,QString.fromLatin1(""))
+ self.tabWidget.insertTab(self.advancedTab,QString.fromLatin1(""))
- self.tab_2 = QWidget(self.tabWidget,"tab_2")
-
- self.tabWidget.insertTab(self.tab_2,QString.fromLatin1(""))
+ self.basicTab = QWidget(self.tabWidget,"basicTab")
+ self.tabWidget.insertTab(self.basicTab,QString.fromLatin1(""))
self.languageChange()
self.device = None
def languageChange(self):
- self.tabWidget.changeTab(self.tab,self.__tr("Basic Settings"))
- self.tabWidget.changeTab(self.tab_2,self.__tr("Advanced Settings"))
+ self.tabWidget.changeTab(self.advancedTab,self.__tr("Advanced Settings"))
+ self.tabWidget.changeTab(self.basicTab,self.__tr("Basic Settings"))
def __tr(self,s,c = None):
return qApp.translate("Form1",s,c)
@@ -70,13 +85,19 @@
for option in self.optionList:
option.widget.updateState()
+ def showMore(self):
+ if self.opt.isShown():
+ self.opt.hide()
+ else:
+ self.opt.show()
+
def deviceSelected(self,no):
self.clearOptions()
if no > 0:
self.opt = QWidget(self.tabViewport)
self.tabLayout.addWidget(self.opt)
self.optLayout = QVBoxLayout(self.opt)
-
+
self.tmpVBox = QVBox(self.opt,"vbox")
self.loadingLabel = QLabel("Loading...",self.tmpVBox,"loadingLabel")
self.optLayout.addWidget(self.tmpVBox)
@@ -101,7 +122,19 @@
self.groupBoxes = []
self.optionList = []
for option in self.options:
- if option[4] == sane.TYPE_GROUP:
+ if option[1] == "mode":
+ self.basicOptionsBox.removeChild(self.scanMode)
+ self.scanMode = Option(self.basicOptionsBox, option, self.device)
+ self.optionList.append(self.scanMode)
+ self.scanMode = self.scanMode.getWidget(None)
+ elif option[1] == "resolution":
+ self.basicOptionsBox.removeChild(self.resolution)
+ self.resolution = Option(self.basicOptionsBox, option, self.device)
+ self.optionList.append(self.resolution)
+ self.resolution = self.resolution.getWidget(None)
+ elif option[1] == "preview":
+ continue
+ elif option[4] == sane.TYPE_GROUP:
groupBox = QGroupBox(1, Qt.Vertical, option[2], self.opt, option[2] + "GroupBox")
groupBox.setFlat(True)
self.groupBoxes.append(groupBox)
@@ -112,7 +145,6 @@
self.optionList.append(o)
self.connect(o.widget, PYSIGNAL("stateChanged"), self.updateOptions)
- self.opt.show()
self.emit(PYSIGNAL("newDeviceSelected"),())
def getOptionValues(self):
@@ -127,6 +159,9 @@
self.optionList[i].setValue(values[i])
def clearOptions(self):
+ self.scanMode.setEnabled(False)
+ self.resolution.setEnabled(False)
+ self.showAdvancedButton.setEnabled(False)
if self.opt != None:
self.tabLayout.remove(self.opt)
self.opt = None
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi