magicicada gui

Merge lp:~facundo/magicicada-gui/dependencies into lp:magicicada-gui

  1. dependencies
  2. Merge into trunk
Proposed by Facundo Batista
Status: Merged
Approved by: Natalia Bidart
Approved revision: 140
Merged at revision: 140
Proposed branch: lp:~facundo/magicicada-gui/dependencies
Merge into: lp:magicicada-gui
Diff against target: 75 lines (+19/-10)
3 files modified
README.txt (+11/-1)
magicicada/gui/gtk/operations.py (+5/-4)
magicicada/helpers.py (+3/-5)
To merge this branch: bzr merge lp:~facundo/magicicada-gui/dependencies
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Review via email: mp+311141@code.launchpad.net

Commit message

Some details to have project running in Xenial.

Description of the change

Some details to have project running in Xenial.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.txt'
2--- README.txt 2010-07-30 21:28:55 +0000
3+++ README.txt 2016-11-17 12:56:19 +0000
4@@ -1,8 +1,18 @@
5-This is Magicicada!
6+This is Magicicada GUI!
7
8 A GTK+ frontend for the "Chicharra" part of Ubuntu One client.
9
10
11+HOWTO run it from source
12+------------------------
13+
14+Just do, from where you branched the project:
15+
16+ PYTHONPATH=$MAGICICADA_CLIENT_BRANCH:. bin/magicicada
17+
18+(being $MAGICICADA_CLIENT_BRANCH the path of where you have
19+your working lp:magicicada-client)
20+
21
22 HOWTO do a source release
23 -------------------------
24
25=== modified file 'magicicada/gui/gtk/operations.py'
26--- magicicada/gui/gtk/operations.py 2013-11-26 21:42:39 +0000
27+++ magicicada/gui/gtk/operations.py 2016-11-17 12:56:19 +0000
28@@ -24,9 +24,9 @@
29 # pylint: disable=E0611
30 from gi.repository import Gtk
31 # pylint: enable=E0611
32-from ubuntuone.controlpanel.gui import humanize
33
34 from magicicada import queue_content, syncdaemon
35+from magicicada.helpers import humanize_bytes
36 from magicicada.gui.gtk.helpers import Buildable
37
38 # pylint: disable=E0602
39@@ -239,7 +239,8 @@
40 transfered = transf.transfered
41 transfer = (transfered / float(transf.total)) * 100
42 self.ops_store.set_value(row_iter, 5, int(transfer))
43- text = TRANSFER_TEXT.format(transfered=humanize(transfered),
44- total=humanize(transf.total),
45- percent=transfer)
46+ text = TRANSFER_TEXT.format(
47+ transfered=humanize_bytes(transfered),
48+ total=humanize_bytes(transf.total),
49+ percent=transfer)
50 self.ops_store.set_value(row_iter, 7, text)
51
52=== modified file 'magicicada/helpers.py'
53--- magicicada/helpers.py 2011-09-30 15:58:24 +0000
54+++ magicicada/helpers.py 2016-11-17 12:56:19 +0000
55@@ -1,9 +1,6 @@
56 # -*- coding: utf-8 -*-
57 #
58-# Authors: Natalia Bidart <nataliabidart@gmail.com>
59-# Facundo Batista <facundo@taniquetil.com.ar>
60-#
61-# Copyright 2010-2011 Chicharreros
62+# Copyright 2010-2016 Chicharreros
63 #
64 # This program is free software: you can redistribute it and/or modify it
65 # under the terms of the GNU General Public License version 3, as published
66@@ -26,7 +23,8 @@
67 from functools import wraps
68
69
70-NO_OP = lambda *a, **kw: None
71+def NO_OP(*a, **kw):
72+ """Don't do anything."""
73
74
75 def log(logger, level=logging.DEBUG):

Subscribers

People subscribed via source and target branches