Slip Cover

Merge lp:~aruna-hewapathirane/slip-cover/handle-unpaired-databases into lp:slip-cover

  1. handle-unpaired-databases
  2. Merge into trunk
Proposed by Aruna Hewapathirane
Status: Merged
Merged at revision: 32
Proposed branch: lp:~aruna-hewapathirane/slip-cover/handle-unpaired-databases
Merge into: lp:slip-cover
Diff against target: 79 lines (+38/-23)
2 files modified
.quickly (+1/-1)
bin/slip-cover (+37/-22)
To merge this branch: bzr merge lp:~aruna-hewapathirane/slip-cover/handle-unpaired-databases
Reviewer Review Type Date Requested Status
Rick Spencer Approve
Review via email: mp+71514@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Rick Spencer (rick-rickspencer3) wrote :

Looks good, nice fix

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.quickly'
2--- .quickly 2010-04-18 17:39:15 +0000
3+++ .quickly 2011-08-15 07:53:17 +0000
4@@ -1,3 +1,3 @@
5 project = slip-cover
6-version = 0.4
7+version = 0.4.3
8 template = ubuntu-application
9
10=== modified file 'bin/slip-cover'
11--- bin/slip-cover 2010-04-23 00:14:29 +0000
12+++ bin/slip-cover 2011-08-15 07:53:17 +0000
13@@ -114,29 +114,44 @@
14 mi.connect("activate",self.load_db,db_name)
15 databases_menu.append(mi)
16 db_rt = 'http://www.freedesktop.org/wiki/Specifications/desktopcouch/paired_server'
17- db_info = server_db.get_records(db_rt, True).rows[0].value
18+
19+ try:
20+ # Check if ubuntu 1 cloud is available ?
21+ db_info = server_db.get_records(db_rt, True).rows[0].value
22+
23+ except IndexError, e:
24+ print e # - used for debugging.. comment out after testing.
25+
26+ # If it throws up list index out of range errors no ubuntu1 cloud, soo.. do nothing just ignore that
27+ # But set db_info to work locally..
28+
29+ db_info = server_db.get_records(db_rt, True) # remove .rows[0].value so works locally !
30+
31+ else:
32+ # ubuntu1 IS available soo.. go straight into Rick's code and pair with ubuntu one... :-)
33+
34
35- info_vbox = gtk.VBox(True, 5)
36- info_vbox.show()
37-
38- table = gtk.Table(rows=len(db_info.keys()) - 1,columns = 2)
39- table.set_row_spacings(10)
40- table.show()
41-
42- for i,k in enumerate(db_info.keys()):
43- if k != "record_type":
44- key_label = gtk.Label(k)
45- key_label.show()
46- key_label.set_alignment(1,.5)
47- value_label = gtk.Label(db_info[k])
48- value_label.set_alignment(0,.5)
49- value_label.show()
50-
51- table.attach(key_label,0,1,i,i+1,gtk.FILL,gtk.FILL, 5)
52- table.attach(value_label,1,2,i,i+1,gtk.FILL,gtk.FILL,5)
53- tab_label = gtk.Label(_("Server Info"))
54- tab_label.show()
55- self.builder.get_object("notebook1").append_page(table,tab_label)
56+ info_vbox = gtk.VBox(True, 5)
57+ info_vbox.show()
58+
59+ table = gtk.Table(rows=len(db_info.keys()) - 1,columns = 2)
60+ table.set_row_spacings(10)
61+ table.show()
62+
63+ for i,k in enumerate(db_info.keys()):
64+ if k != "record_type":
65+ key_label = gtk.Label(k)
66+ key_label.show()
67+ key_label.set_alignment(1,.5)
68+ value_label = gtk.Label(db_info[k])
69+ value_label.set_alignment(0,.5)
70+ value_label.show()
71+
72+ table.attach(key_label,0,1,i,i+1,gtk.FILL,gtk.FILL, 5)
73+ table.attach(value_label,1,2,i,i+1,gtk.FILL,gtk.FILL,5)
74+ tab_label = gtk.Label(_("Server Info"))
75+ tab_label.show()
76+ self.builder.get_object("notebook1").append_page(table,tab_label)
77
78
79 def new_database(self, widget, data=None):

Subscribers

People subscribed via source and target branches