[Uludag-commits] r15596 - trunk/staj-projeleri/scanner/src
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
2 Eki 2007 Sal 16:25:01 EEST
Author: asli.okur
Date: Tue Oct 2 16:25:01 2007
New Revision: 15596
Modified:
trunk/staj-projeleri/scanner/src/main.py
trunk/staj-projeleri/scanner/src/scanner.py
Log:
KApplication calisiyor
Modified: trunk/staj-projeleri/scanner/src/main.py
=================================================================
--- trunk/staj-projeleri/scanner/src/main.py (original)
+++ trunk/staj-projeleri/scanner/src/main.py Tue Oct 2 16:25:01 2007
@@ -9,33 +9,35 @@
from scanner import *
import pickle
-#version = '0.1'
-#description = "Scanner Interface"
+version = '0.1'
+description = "Scanner Interface"
-#def loadIcon(name, group=KIcon.Desktop):
- #return KGlobal.iconLoader().loadIcon(name, group)
+def loadIcon(name, group=KIcon.Desktop):
+ return KGlobal.iconLoader().loadIcon(name, group)
-#def loadIconSet(name, group=KIcon.Desktop):
- #return KGlobal.iconLoader().loadIconSet(name, group)
+def loadIconSet(name, group=KIcon.Desktop):
+ return KGlobal.iconLoader().loadIconSet(name, group)
-#def AboutData():
- #about_data = KAboutData(
- #'scanner',
- #'Scanner',
- #version,
- #description,
- #KAboutData.License_GPL,
- #'(C) 2007 UEKAE/TÜBİTAK',
- #None,
- #None,
- #'blabla at pardus.org.tr')
- #return about_data
+def AboutData():
+ about_data = KAboutData(
+ 'scanner',
+ 'Scanner',
+ version,
+ description,
+ KAboutData.License_GPL,
+ '(C) 2007 UEKAE/TÜBİTAK',
+ None,
+ None,
+ 'bugzilla at pardus.org.tr')
+ about_data.addAuthor("Barış Can Daylık", "Main Developer", None)
+ about_data.addAuthor("Aslı Okur", "GUI Developer and Current Maintainer", "asliokur at yahoo.com")
+ return about_data
class Main(KDialog):
def __init__(self,parent = None,name = None,modal = 0,fl = 0):
KDialog.__init__(self,parent,name,modal,fl)
-
- #self.setIcon(loadIcon("scanner"))
+ self.connect(kapp, SIGNAL("shutDown()"), self.slotQuit)
+ self.setIcon(loadIcon("scanner"))
if not name:
self.setName("Main")
@@ -120,6 +122,10 @@
+ def slotQuit(self):
+ #sane.exit()
+ self.deleteLater()
+ kapp.quit()
def languageChange(self):
self.setCaption(self.__tr("Please Select a Device"))
@@ -134,6 +140,7 @@
def quit(self):
sane.exit()
+ #self.queryExit()
def openDevice(self,device = None):
if device == None:
@@ -154,24 +161,25 @@
if __name__ == "__main__":
- ##a = KApplication(sys.argv,"")
- #about_data = AboutData()
- #KCmdLineArgs.init(sys.argv,about_data)
- #a = KUniqueApplication(True, True, True)
- ##QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
- #mainForm = Main()
- #a.setMainWidget(mainForm)
+ global kapp
+ #a = KApplication(sys.argv,"")
+ about_data = AboutData()
+ KCmdLineArgs.init(sys.argv,about_data)
+ kapp = KUniqueApplication(True, True, True)
+ #QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
+ mainForm = Main()
+ kapp.setMainWidget(mainForm)
#QObject.connect(a, SIGNAL("aboutToQuit()"), mainForm.quit)
- ##QObject.connect(a, SIGNAL("aboutToQuit()"), a, SLOT("quit()"))
- ##QObject.connect(a,SIGNAL("lastWindowClosed()"),mainForm.quit)
- ##a.exec_loop()
- #sys.exit(mainForm.exec_loop())
+ #QObject.connect(a, SIGNAL("aboutToQuit()"), a, SLOT("quit()"))
+ #QObject.connect(a, SIGNAL("lastWindowClosed()"),mainForm.quit)
+ #a.exec_loop()
+ sys.exit(kapp.exec_loop())
- a = QApplication(sys.argv)
- QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
- mainForm = Main()
- a.setMainWidget(mainForm)
- QObject.connect(a,SIGNAL("lastWindowClosed()"),mainForm.quit)
- a.exec_loop()
+ #a = QApplication(sys.argv)
+ #QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
+ #mainForm = Main()
+ #a.setMainWidget(mainForm)
+ #QObject.connect(a,SIGNAL("lastWindowClosed()"),mainForm.quit)
+ #a.exec_loop()
Modified: trunk/staj-projeleri/scanner/src/scanner.py
=================================================================
--- trunk/staj-projeleri/scanner/src/scanner.py (original)
+++ trunk/staj-projeleri/scanner/src/scanner.py Tue Oct 2 16:25:01 2007
@@ -15,9 +15,9 @@
from scanthread import *
-class ScanWindow(QMainWindow):
+class ScanWindow(KMainWindow):
def __init__(self,parent = None,name = None,fl = 0):
- QMainWindow.__init__(self,parent,name,fl)
+ KMainWindow.__init__(self,parent,name,fl)
#sane.init()
@@ -60,19 +60,8 @@
self.connect(self.progress,SIGNAL("canceled()"),self.stopScan)
-
- self.helpContentsAction = QAction(self,"helpContentsAction")
- self.helpIndexAction = QAction(self,"helpIndexAction")
- self.helpAboutAction = QAction(self,"helpAboutAction")
-
- self.MenuBar = QMenuBar(self,"MenuBar")
-
- self.helpMenu = QPopupMenu(self)
- self.helpContentsAction.addTo(self.helpMenu)
- self.helpIndexAction.addTo(self.helpMenu)
- self.helpMenu.insertSeparator()
- self.helpAboutAction.addTo(self.helpMenu)
- self.MenuBar.insertItem(QString(""),self.helpMenu,1)
+ self.menuBar()
+ self.menuBar().insertItem(QString("Help"), self.helpMenu())
self.noDeviceSelected()
@@ -81,37 +70,12 @@
self.resize(QSize(744,588).expandedTo(self.minimumSizeHint()))
self.clearWState(Qt.WState_Polished)
- self.connect(self.helpIndexAction,SIGNAL("activated()"),self.helpIndex)
- self.connect(self.helpContentsAction,SIGNAL("activated()"),self.helpContents)
- self.connect(self.helpAboutAction,SIGNAL("activated()"),self.helpAbout)
-
def exit(self):
print "exiting"
sane.exit()
def languageChange(self):
self.setCaption(self.__tr("Scanner"))
- self.helpContentsAction.setText(self.__tr("Contents"))
- self.helpContentsAction.setMenuText(self.__tr("&Contents..."))
- self.helpContentsAction.setAccel(QString.null)
- self.helpIndexAction.setText(self.__tr("Index"))
- self.helpIndexAction.setMenuText(self.__tr("&Index..."))
- self.helpIndexAction.setAccel(QString.null)
- self.helpAboutAction.setText(self.__tr("About"))
- self.helpAboutAction.setMenuText(self.__tr("&About"))
- self.helpAboutAction.setAccel(QString.null)
- if self.MenuBar.findItem(1):
- self.MenuBar.findItem(1).setText(self.__tr("&Help"))
-
-
- def helpIndex(self):
- print "Scanner.helpIndex(): Not implemented yet"
-
- def helpContents(self):
- print "Scanner.helpContents(): Not implemented yet"
-
- def helpAbout(self):
- about = QMessageBox.about(self, "About", "Bu program Pardus staj projeleri kapsaminda hazirlanmistir." )
def __tr(self,s,c = None):
return qApp.translate("Scanner",s,c)
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi