Menu
▾
▴
[Gmailagent-cvs] GA-main AboutDialog_forms.py,1.24,1.25 AddressDialog.ui,1.6,1.7 AddressDialog_forms.py,1.14,1.15 GuiQT.py,1.36,1.37 HelpDialog_forms.py,1.13,1.14 LoginDialog_forms.py,1.27,1.28 MainWin_forms.py,1.27,1.28
Update of /cvsroot/gmailagent/GA-main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14380 Modified Files: AboutDialog_forms.py AddressDialog.ui AddressDialog_forms.py GuiQT.py HelpDialog_forms.py LoginDialog_forms.py MainWin_forms.py Log Message: update the GUI logic Index: AddressDialog.ui =================================================================== RCS file: /cvsroot/gmailagent/GA-main/AddressDialog.ui,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AddressDialog.ui 14 Sep 2005 11:36:28 -0000 1.6 --- AddressDialog.ui 14 Sep 2005 15:23:45 -0000 1.7 *************** *** 281,290 **** <x>20</x> <y>360</y> ! <width>110</width> <height>26</height> </rect> </property> <property name="text"> ! <string>Edit addressbook</string> </property> </widget> --- 281,290 ---- <x>20</x> <y>360</y> ! <width>150</width> <height>26</height> </rect> </property> <property name="text"> ! <string>Start contacts manager</string> </property> </widget> Index: AddressDialog_forms.py =================================================================== RCS file: /cvsroot/gmailagent/GA-main/AddressDialog_forms.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** AddressDialog_forms.py 14 Sep 2005 11:36:28 -0000 1.14 --- AddressDialog_forms.py 14 Sep 2005 15:23:45 -0000 1.15 *************** *** 3,7 **** # Form implementation generated from reading ui file 'AddressDialog.ui' # ! # Created: Mon Aug 15 12:50:15 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # --- 3,7 ---- # Form implementation generated from reading ui file 'AddressDialog.ui' # ! # Created: Wed Sep 14 17:23:00 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # *************** *** 164,168 **** self.pushButtonEdit = QPushButton(self,"pushButtonEdit") ! self.pushButtonEdit.setGeometry(QRect(20,360,110,26)) self.languageChange() --- 164,168 ---- self.pushButtonEdit = QPushButton(self,"pushButtonEdit") ! self.pushButtonEdit.setGeometry(QRect(20,360,150,26)) self.languageChange() *************** *** 196,200 **** self.listViewBook.header().setLabel(1,self.__tr("Email Address")) self.textLabel1.setText(self.__tr("<b>Gmail contacts</b>")) ! self.pushButtonEdit.setText(self.__tr("Edit addressbook")) --- 196,200 ---- self.listViewBook.header().setLabel(1,self.__tr("Email Address")) self.textLabel1.setText(self.__tr("<b>Gmail contacts</b>")) ! self.pushButtonEdit.setText(self.__tr("Start contacts manager")) Index: AboutDialog_forms.py =================================================================== RCS file: /cvsroot/gmailagent/GA-main/AboutDialog_forms.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** AboutDialog_forms.py 14 Sep 2005 11:36:28 -0000 1.24 --- AboutDialog_forms.py 14 Sep 2005 15:23:45 -0000 1.25 *************** *** 3,7 **** # Form implementation generated from reading ui file 'AboutDialog.ui' # ! # Created: Mon Aug 15 12:50:15 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # --- 3,7 ---- # Form implementation generated from reading ui file 'AboutDialog.ui' # ! # Created: Wed Sep 14 17:23:00 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # Index: GuiQT.py =================================================================== RCS file: /cvsroot/gmailagent/GA-main/GuiQT.py,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** GuiQT.py 14 Sep 2005 11:36:28 -0000 1.36 --- GuiQT.py 14 Sep 2005 15:23:45 -0000 1.37 *************** *** 33,37 **** import Gmail ! import sys,os,logging try: --- 33,37 ---- import Gmail ! import sys,os,logging,weakref try: *************** *** 195,199 **** "contacts require access to your Gmail account." dlg = Gmail.ModalPopup(parent=self,text=txt) - ## BIG TODO: make this work :-) if dlg.start():# Yes obs = Observer(self._get_contacts) --- 195,198 ---- *************** *** 205,209 **** def _get_contacts(self,ga): ! """Callback for the observer""" self.obs = Observer(self.lineEditTo.setText) AddressBookDialog(self,gac=ga,observer=self.obs) --- 204,209 ---- def _get_contacts(self,ga): ! """Callback for the observer from the pushButtonAdress_clicked""" ! self.ga = ga# we also set the login object which is used to test if we logged in self.obs = Observer(self.lineEditTo.setText) AddressBookDialog(self,gac=ga,observer=self.obs) *************** *** 342,347 **** def pushButtonEdit_clicked(self): - if self.gcm: - return result = Gmail.start_gcm(self.GC,Qapplication) print "result",result --- 342,345 ---- *************** *** 353,356 **** --- 351,356 ---- else: #We make it a attribute to prevent destruction by the Python Garbage collector + # As a reminder GuiQTgcm.MainWin is a singleton so no need to prevent + # multiple instances. self.gcm = result[1] Index: MainWin_forms.py =================================================================== RCS file: /cvsroot/gmailagent/GA-main/MainWin_forms.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** MainWin_forms.py 14 Sep 2005 11:36:28 -0000 1.27 --- MainWin_forms.py 14 Sep 2005 15:23:45 -0000 1.28 *************** *** 3,7 **** # Form implementation generated from reading ui file 'MainWin.ui' # ! # Created: Mon Aug 15 12:50:15 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # --- 3,7 ---- # Form implementation generated from reading ui file 'MainWin.ui' # ! # Created: Wed Sep 14 17:23:00 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # Index: HelpDialog_forms.py =================================================================== RCS file: /cvsroot/gmailagent/GA-main/HelpDialog_forms.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** HelpDialog_forms.py 14 Sep 2005 11:36:28 -0000 1.13 --- HelpDialog_forms.py 14 Sep 2005 15:23:45 -0000 1.14 *************** *** 3,7 **** # Form implementation generated from reading ui file 'HelpDialog.ui' # ! # Created: Mon Aug 15 12:50:15 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # --- 3,7 ---- # Form implementation generated from reading ui file 'HelpDialog.ui' # ! # Created: Wed Sep 14 17:23:00 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # Index: LoginDialog_forms.py =================================================================== RCS file: /cvsroot/gmailagent/GA-main/LoginDialog_forms.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** LoginDialog_forms.py 14 Sep 2005 11:36:28 -0000 1.27 --- LoginDialog_forms.py 14 Sep 2005 15:23:45 -0000 1.28 *************** *** 3,7 **** # Form implementation generated from reading ui file 'LoginDialog.ui' # ! # Created: Mon Aug 15 12:50:15 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # --- 3,7 ---- # Form implementation generated from reading ui file 'LoginDialog.ui' # ! # Created: Wed Sep 14 17:23:00 2005 # by: The PyQt User Interface Compiler (pyuic) 3.14.1 # |
