[Workman-svn] SF.net SVN: workman:[44] trunk/src

[<jm...@us...>]

Revision: 44
          http://workman.svn.sourceforge.net/workman/?rev=44&view=rev
Author:   jmsilva
Date:     2011-10-21 00:58:48 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
- Stripped the employer/project strings of leading and trailing whitespace prior to adding them to the DataStore
- Removed random whitespace

Modified Paths:
--------------
    trunk/src/db.py
    trunk/src/gui/dialogs.py
    trunk/src/gui/main_window.py
    trunk/src/workman.py

Added Paths:
-----------
    trunk/src/gui/build_ui.bat

Modified: trunk/src/db.py
===================================================================
--- trunk/src/db.py	2011-10-21 00:58:33 UTC (rev 43)
+++ trunk/src/db.py	2011-10-21 00:58:48 UTC (rev 44)
@@ -60,8 +60,8 @@
 		query.prepare('insert into employers(employer_name, '
 			'employer_hourly_rate, employer_rate_start_date) values('
 			':employer, :rate, datetime());')
-		query.addBindValue(employer)
-		query.addBindValue(rate)        
+		query.bindValue(':employer', employer)
+		query.addBindValue(':rate', rate)        
 		return query.exec_()
 		
 	def insertSession(self, project, startDate, endDate, desc, breaks):
@@ -76,10 +76,10 @@
 		query.prepare('Insert into sessions(project_name, '
 			'project_description, employer_id) values('
 			':project, :startDate, :endDate, :desc);')
-		query.addBindValue(project)
-		query.addBindValue(startDate)
-		query.addBindValue(endDate)
-		query.addBindValue(desc)
+		query.bindValue(':project', project)
+		query.bindValue(':startDate', startDate)
+		query.bindValue(':endDate', endDate)
+		query.bindValue(':desc', desc)
 		return query.exec_()
 	
 	# TODO: Add limits to the queries
@@ -129,7 +129,7 @@
 		query = QtSql.QSqlQuery(self.db)
 		query.prepare('select session_id, session_start_time, session_end_time, '
 			'session_description from sessions where project_id = :project;')
-		query.addBindValue(project)
+		query.bindValue(':project', project)
 		status = query.exec_()
 		if not status:
 			return False
@@ -153,7 +153,7 @@
 		query = QtSql.QSqlQuery(self.db)
 		query.prepare('select break_start_time, break_end_time, ' 
 			'break_reason from breaks where session_id = :session;')
-		query.addBindValue(session)
+		query.bindValue(':session', session)
 		status = query.exec_()
 		if not status:
 			return False

Added: trunk/src/gui/build_ui.bat
===================================================================
--- trunk/src/gui/build_ui.bat	                        (rev 0)
+++ trunk/src/gui/build_ui.bat	2011-10-21 00:58:48 UTC (rev 44)
@@ -0,0 +1,7 @@
+pyrcc4 res.qrc -o res_rc.py
+
+echo #!/usr/bin/python > compiled_ui.py
+for %%i in ( *.ui ) do (
+	C:\Python27\Lib\site-packages\PyQt4\pyuic4 %%i >> compiled_ui.py
+)
+done

Modified: trunk/src/gui/dialogs.py
===================================================================
--- trunk/src/gui/dialogs.py	2011-10-21 00:58:33 UTC (rev 43)
+++ trunk/src/gui/dialogs.py	2011-10-21 00:58:48 UTC (rev 44)
@@ -39,18 +39,19 @@
 		self.okButton.setEnabled(False)
 		
 	def employerNameChanged(self, text):
-		if text in self.dataStore.employers.keys():
+		trimmed = text.trimmed() 
+		if trimmed in self.dataStore.employers.keys():
 			self.okButton.setEnabled(False)
 			#TODO: Show a tooltip explaining what happened
-		elif text == '':
+		elif trimmed == '':
 			self.okButton.setEnabled(False)
 			#TODO: Show a tooltip explaining what happened
 		else:
 			self.okButton.setEnabled(True)
 			
 	def accept(self):
-		name = self.employerNameBox.text()
-		desc = self.descriptionBox.toPlainText()
+		name = self.employerNameBox.text().trimmed()
+		desc = self.descriptionBox.toPlainText().trimmed()
 		rate = self.hourlyRateSpinner.value()
 		self.dataStore.addEmployer(name, desc, rate)	
 		
@@ -97,7 +98,7 @@
 			self.__checkOkButtonState() 
 			
 	def __checkOkButtonState(self):
-		text = self.projectNameBox.text()		
+		text = self.projectNameBox.text().trimmed()		
 		if self.employerIndex == 0:
 			currentEmployer = DataStore.NO_EMPLOYER
 		else:
@@ -120,10 +121,10 @@
 		if self.employerChoice.currentIndex() == 0:
 			employerName = DataStore.NO_EMPLOYER
 		else:
-			employerName = self.employerChoice.currentText()			
+			employerName = self.employerChoice.currentText()
 		
-		projectName = self.projectNameBox.text()
-		projectDescription = self.descriptionBox.toPlainText()
+		projectName = self.projectNameBox.text().trimmed()
+		projectDescription = self.descriptionBox.toPlainText().trimmed()
 		
 		self.dataStore.addProject(
 					projectName, projectDescription, employerName)
@@ -227,7 +228,7 @@
 			self.employerChoice.setCurrentIndex(self.employerIndex)
 			employerDialog = NewEmployerDialog(self.dataStore)			
 			if employerDialog.exec_() == QDialog.Accepted:
-				self.__populateEmployerBox(employerDialog.employerNameBox.text())
+				self.__populateEmployerBox(employerDialog.employerNameBox.text().trimmed())
 			self.ignoreComboBoxChanges = False
 		else:
 			self.employerIndex = index
@@ -250,7 +251,7 @@
 				self.__populateProjectBox()			
 			self.ignoreComboBoxChanges = False
 		else:
-			self.projectIndex = index			
+			self.projectIndex = index
 		
 	def accept(self):
 		if self.employerIndex == 0:

Modified: trunk/src/gui/main_window.py
===================================================================
--- trunk/src/gui/main_window.py	2011-10-21 00:58:33 UTC (rev 43)
+++ trunk/src/gui/main_window.py	2011-10-21 00:58:48 UTC (rev 44)
@@ -102,9 +102,9 @@
 		dialog = dialogs.EndSessionDialog(self.dataStore)
 		if dialog.exec_() == QtGui.QDialog.Accepted:
 			if self.dataStore.activeBreak is not None:
-				self.endBreak(False)		
+				self.endBreak(False)
 			
-			self.__setStartButton(True)			
+			self.__setStartButton(True)
 			self.trayIcon.setContextMenu(self.regularMenu)
 			#TODO: Show some info about the session in the message text
 			self.trayIcon.showMessage(self.tr("Work session ended"),
@@ -121,10 +121,10 @@
 		#TODO: Break reasons
 		self.dataStore.startBreak('')
 		self.trayIcon.setContextMenu(self.breakMenu)
-		if showMessage:			
+		if showMessage:
 			self.trayIcon.showMessage(self.tr("Taking a break"),
 				self.tr("Enjoy your break!\n"
-					"Right-click the menu and select 'Resume work' to " 
+					"Right-click the menu and select 'Resume work' to "
 					"continue working"))
 	
 	def endBreak(self):
@@ -145,7 +145,7 @@
 		icon = QtGui.QMessageBox.Question
 		activeSession = False
 		if self.dataStore.activeSession is not None:
-			text = self.tr('A work session is in progress ' +
+			text = self.tr('A work session is in progress '
 						'and will be ended if you choose to quit.\n\n') + text
 			icon = QtGui.QMessageBox.Warning
 			activeSession = True
@@ -175,8 +175,7 @@
 			self.showOrHide()
 		
 	def showWindow(self):
-		self.show()
-		
+		self.show()		
 	
 	def createProject(self):
 		'''Opens the new project dialog'''		
@@ -204,8 +203,7 @@
 				QtCore.SIGNAL('clicked()'), self.startSession)
 			self.connect(self.startSessionButton, 
 				QtCore.SIGNAL('clicked()'), self.endSession)
-			self.startSessionButton.setText(self.tr("&Stop working..."))
-			
+			self.startSessionButton.setText(self.tr("&Stop working..."))			
 		
 	def __reloadItemModel(self):
 		itemModel = self.dataStore.getProjectItemModel()

Modified: trunk/src/workman.py
===================================================================
--- trunk/src/workman.py	2011-10-21 00:58:33 UTC (rev 43)
+++ trunk/src/workman.py	2011-10-21 00:58:48 UTC (rev 44)
@@ -208,9 +208,8 @@
 				continue
 			
 			if i.endTime is None:
-				timeWorked = (
-					i.startTime.secsTo(
-								QtCore.QDateTime.currentDateTime()))
+				timeWorked = i.startTime.secsTo(
+								QtCore.QDateTime.currentDateTime())
 			else:
 				timeWorked = i.startTime.secsTo(i.endTime)
 				

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.