Changeset 35

Timestamp:

05/12/10 20:04:16 (2 years ago)

Author:

stefan

Message:

-bugs entfernt
-skript zum paketerstellen erneuert

Location:

trunk

Files:

• backend/config.py (modified) (3 diffs)
• backend/sqlite.py (modified) (1 diff)
• build.sh (modified) (1 diff)
• people.py (modified) (6 diffs)
• publish/DEBIAN/control (modified) (1 diff)

trunk/backend/config.py

@@ -8 +8 @@
 
 global myconfig
-
+home = os.getenv('USERPROFILE') or os.getenv('HOME')
 class Config(dict):
     
@@ -36 +36 @@
         self._config.set("global", "backend", "sqlite")
         self._config.set("global", "version", people.PeopleEdit.version)
-        self._config.set("global", "email","Thunderbird")
-        self._config.set("global", "vcard", self.path+"/people/")
+        self._config.set("global", "email","Standard")
+        self._config.set("global", "vcard", home+"/people/")
         self._config.add_section("email-unix")
-        self._config.set("email-unix", "Thunderbird", "/usr/bin/env thunderbird")
+        self._config.set("email-unix", "Standard", "xdg-open mailto:%")
+        self._config.set("email-unix", "Thunderbird", "/usr/bin/env thunderbird -compose to=%s")
+        
         
     
@@ -59 +61 @@
         return self._config.options(section)
     
-home = os.getenv('USERPROFILE') or os.getenv('HOME')
+
 myconfig = Config(home+"/.config/peopleedit/people.conf")

trunk/backend/sqlite.py

@@ -63 +63 @@
                             company_telephone,company_fax,telephone_private,telephone_car,fax_private,street,housenumber,city,postal,state,country,image,webpage,icq,skype,jabber,aol,msn) VALUES(NULL,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', \
                             (self.name, self.forename, self.email, self.contactname, self.nickname, self.company, self.company_city, self.company_postal, self.company_street, self.company_housenumber, self.company_telephone,
-                             self.busFax, self.telephone_private, self.telephone_car, self.fax_private, self.street, self.streetNumber, self.city, self.postal, self.state, self.country, self.image, self.webpage, self.icq, self.skype, self.jabber, self.aol, self.msn))
+                             self.company_fax, self.telephone_private, self.telephone_car, self.fax_private, self.street, self.housenumber, self.city, self.postal, self.state, self.country, self.image, self.webpage, self.icq, self.skype, self.jabber, self.aol, self.msn))
 
     def delete(self):

trunk/build.sh

@@ -1 +1 @@
 #!/bin/sh
-mkdir -p publish/usr/share/peopleedit/
-cp -u *.py *.glade  publish/usr/share/peopleedit/
-cp -R backend/ locale/ publish/usr/share/peopleedit/
+cp -R publish/ build/
+mkdir -p build/usr/share/peopleedit/
+cp -u *.py *.glade  build/usr/share/peopleedit/
+cp -R backend/ locale/ gui/ libs/ build/usr/share/peopleedit/
 #delete obsolete files
-for i in `find publish/usr/share/peopleedit/ -name "*.pyc"`
+for i in `find build/usr/share/peopleedit/ -name "*.pyc"`
 do
         rm $i
 done
-dpkg -b publish/ peopleedit-$1.deb
-rm -R publish/usr/share/peopleedit/
+for i in `find build/ -name ".svn"`
+do
+        rm -R $i
+done
+dpkg -b build/ peopleedit-$1.deb
+rm -R build/

trunk/people.py

@@ -47 +47 @@
 # import gui stuff
 from gui.options import OptionsDialog
+APP_DIR = os.path.dirname(__file__) or "."
 APP_NAME = 'people'
-LOCALE_DIR = 'locale'
+LOCALE_DIR = APP_DIR+'/locale'
 try:
     locale.setlocale(locale.LC_ALL, '')
@@ -182 +183 @@
             self.treeviewSelected(None)
         else:
-            self.builder.get_object("nameEntry").set_editable(False)
-            self.builder.get_object("nicknameEntry").set_editable(False)
-            self.builder.get_object("forenameEntry").set_editable(False)
-            self.builder.get_object("contactEntry").set_editable(False)
-            self.builder.get_object("emailEntry").set_editable(False)
-            self.builder.get_object("companyEntry").set_editable(False)
-            self.builder.get_object("cityEntry").set_editable(False)  
-            self.builder.get_object("busCityEntry").set_editable(False)
-            self.builder.get_object("busPostalEntry").set_editable(False)
-            self.builder.get_object("busStreetEntry").set_editable(False)
-            self.builder.get_object("busStreetNumberEntry").set_editable(False)
-            self.builder.get_object("busPhoneEntry").set_editable(False)
-            self.builder.get_object("busFaxEntry").set_editable(False)
-            self.builder.get_object("websiteEntry").set_editable(False)
-            self.builder.get_object("countryEntry").set_editable(False)
-            self.builder.get_object("streetEntry").set_editable(False)
-            self.builder.get_object("streetNumberEntry").set_editable(False)
-            self.builder.get_object("postalEntry").set_editable(False)
-            self.builder.get_object("icqEntry").set_editable(False)
-            self.builder.get_object("aimEntry").set_editable(False)
-            self.builder.get_object("jabberEntry").set_editable(False)
-            self.builder.get_object("msnEntry").set_editable(False)
+            self.set_fields_editable()
         
         #tmp = vcard.VCardManager()
@@ -210 +190 @@
         self.treeview.show()
         self.mainwindow.show()
-        
+    
+    def set_fields_editable(self,edit=False): 
+        self.builder.get_object("nameEntry").set_editable(False)
+        self.builder.get_object("nicknameEntry").set_editable(False)
+        self.builder.get_object("forenameEntry").set_editable(False)
+        self.builder.get_object("contactEntry").set_editable(False)
+        self.builder.get_object("emailEntry").set_editable(False)
+        self.builder.get_object("companyEntry").set_editable(False)
+        self.builder.get_object("cityEntry").set_editable(False)  
+        self.builder.get_object("busCityEntry").set_editable(False)
+        self.builder.get_object("busPostalEntry").set_editable(False)
+        self.builder.get_object("busStreetEntry").set_editable(False)
+        self.builder.get_object("busStreetNumberEntry").set_editable(False)
+        self.builder.get_object("busPhoneEntry").set_editable(False)
+        self.builder.get_object("busFaxEntry").set_editable(False)
+        self.builder.get_object("websiteEntry").set_editable(False)
+        self.builder.get_object("countryEntry").set_editable(False)
+        self.builder.get_object("streetEntry").set_editable(False)
+        self.builder.get_object("streetNumberEntry").set_editable(False)
+        self.builder.get_object("postalEntry").set_editable(False)
+        self.builder.get_object("icqEntry").set_editable(False)
+        self.builder.get_object("aimEntry").set_editable(False)
+        self.builder.get_object("jabberEntry").set_editable(False)
+        self.builder.get_object("msnEntry").set_editable(False)
+                
     def search(self,widget):
         del self.search_data[:]
@@ -464 +468 @@
     def new_button_clicked(self, widget):
         iter = self.listmodel.append([self.manager.new_contact()])
-        selection = self.treeview.get_selection()
-        selection.select_iter(iter)    
+        treeselection = self.treeview.get_selection()
+        (filter, iter2) = treeselection.get_selected()
+        valid_iter=filter.convert_child_iter_to_iter(iter)
+        treeselection.select_iter(valid_iter)    
         self.treeviewSelected(None)
         # set all entries editable
@@ -514 +520 @@
     def deletebutton_clicked(self, widget):
         treeselection = self.treeview.get_selection()
-        (model, iter) = treeselection.get_selected()
-        tmp2 = model.get_value(iter, 0)
+        (filter, iter) = treeselection.get_selected()
+        valid_iter=filter.convert_iter_to_child_iter(iter)
+        if (iter == None):
+            return None
+        model = filter.get_model()
+        tmp2 = model.get_value(valid_iter, 0)
         tmp2.delete()
-        self.listmodel.remove(iter)
+        self.listmodel.remove(valid_iter)
+        if self.listmodel.__len__() == 0:
+            self.set_fields_editable()
         # select first entry
         selection = self.treeview.get_selection()
@@ -540 +552 @@
             return None
         tmp2 = model.get_value(iter, 0)
-        if (tmp2.imagePath <> None and os.path.isfile(tmp2.imagePath)):
+        if (tmp2.image <> None and os.path.isfile(tmp2.image)):
             #p=subprocess.Popen("/usr/bin/eog "+tmp2.imagePath)
-            pid = subprocess.Popen(["/usr/bin/eog", tmp2.imagePath]).pid
+            pid = subprocess.Popen(["/usr/bin/eog", tmp2.image]).pid
             
     def sendmail_button_clicked(self, widget):

trunk/publish/DEBIAN/control

@@ -1 +1 @@
 Package: peopleedit
-Version: 2.0alpha
+Version: 2.0beta
 Section: office
 Priority: optional
 Architecture: all
 Essential: no
-Depends: libsqlite3, python(>=2.5), python-pysqlite2(>=2.5), python-glade2, python-gtk2
+Depends: libsqlite3-0, python(>=2.5), python-pysqlite2(>=2.5), python-glade2, python-gtk2
 code-Depends:
 Recommends: 
 Suggests:
-Installed-Size: 18227
+Installed-Size: 25
 Maintainer: Stefan Luedtke <gandalf@silver-boards.de>
 Conflicts: