Ubuntu One Control Panel

Merge lp:~diegosarmentero/ubuntuone-control-panel/loadingoverlay-timing-fix into lp:ubuntuone-control-panel

  1. loadingoverlay-timing-fix
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: dobey
Approved revision: 192
Merged at revision: 192
Proposed branch: lp:~diegosarmentero/ubuntuone-control-panel/loadingoverlay-timing-fix
Merge into: lp:ubuntuone-control-panel
Diff against target: 37 lines (+6/-3)
2 files modified
ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+2/-1)
ubuntuone/controlpanel/logger.py (+4/-2)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-control-panel/loadingoverlay-timing-fix
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+69650@code.launchpad.net

Commit message

Fixing loadingoverlay animation timing.

Description of the change

Fixing loadingoverlay animation timing.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1 trivial

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (13.2 KiB)

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/loadingoverlay-timing-fix into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

running build
Compiled data/qt/device.ui into ubuntuone/controlpanel/gui/qt/ui/device_ui.py
Compiled data/qt/mainwindow.ui into ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
Compiled data/qt/filesyncstatus.ui into ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
Compiled data/qt/folders.ui into ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
Compiled data/qt/loadingoverlay.ui into ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py
Compiled data/qt/devices.ui into ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
Compiled data/qt/preferences.ui into ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
compiled data/qt/images.qrc into ubuntuone/controlpanel/gui/qt/ui/images_rc.py
Compiled data/qt/account.ui into ubuntuone/controlpanel/gui/qt/ui/account_ui.py
Compiled data/qt/controlpanel.ui into ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone
copying ubuntuone/__init__.py -> build/lib.linux-i686-2.7/ubuntuone
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/replication_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/utils.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/login_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/dbus_service.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/backend.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/logger.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
copying ubuntuone/controlpanel/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/package_manager.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/widgets.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/ubuntuonebin.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/account.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/controlpanel.py -> build/lib.linux-i686-2.7/ubuntuone/co...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (13.2 KiB)

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/loadingoverlay-timing-fix into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

running build
Compiled data/qt/device.ui into ubuntuone/controlpanel/gui/qt/ui/device_ui.py
Compiled data/qt/mainwindow.ui into ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
Compiled data/qt/filesyncstatus.ui into ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
Compiled data/qt/folders.ui into ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
Compiled data/qt/loadingoverlay.ui into ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py
Compiled data/qt/devices.ui into ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
Compiled data/qt/preferences.ui into ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
compiled data/qt/images.qrc into ubuntuone/controlpanel/gui/qt/ui/images_rc.py
Compiled data/qt/account.ui into ubuntuone/controlpanel/gui/qt/ui/account_ui.py
Compiled data/qt/controlpanel.ui into ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone
copying ubuntuone/__init__.py -> build/lib.linux-i686-2.7/ubuntuone
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/replication_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/utils.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/login_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/dbus_service.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/backend.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/logger.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
copying ubuntuone/controlpanel/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/package_manager.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/widgets.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/ubuntuonebin.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/account.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/controlpanel.py -> build/lib.linux-i686-2.7/ubuntuone/co...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (13.2 KiB)

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/loadingoverlay-timing-fix into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

running build
Compiled data/qt/device.ui into ubuntuone/controlpanel/gui/qt/ui/device_ui.py
Compiled data/qt/mainwindow.ui into ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
Compiled data/qt/filesyncstatus.ui into ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
Compiled data/qt/folders.ui into ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
Compiled data/qt/loadingoverlay.ui into ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py
Compiled data/qt/devices.ui into ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
Compiled data/qt/preferences.ui into ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
compiled data/qt/images.qrc into ubuntuone/controlpanel/gui/qt/ui/images_rc.py
Compiled data/qt/account.ui into ubuntuone/controlpanel/gui/qt/ui/account_ui.py
Compiled data/qt/controlpanel.ui into ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone
copying ubuntuone/__init__.py -> build/lib.linux-i686-2.7/ubuntuone
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/replication_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/utils.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/login_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/dbus_service.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/backend.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/logger.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
copying ubuntuone/controlpanel/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/package_manager.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/widgets.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/ubuntuonebin.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/account.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/controlpanel.py -> build/lib.linux-i686-2.7/ubuntuone/co...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gui/qt/loadingoverlay.py'
2--- ubuntuone/controlpanel/gui/qt/loadingoverlay.py 2011-07-19 19:16:21 +0000
3+++ ubuntuone/controlpanel/gui/qt/loadingoverlay.py 2011-07-28 13:44:05 +0000
4@@ -106,7 +106,8 @@
5 palette.setColor(palette.Background, QtCore.Qt.transparent)
6 self.setPalette(palette)
7
8- self.timer = self.startTimer(200)
9+ if not self.timer:
10+ self.timer = self.startTimer(200)
11
12 # Invalid name "timerEvent"
13 # pylint: disable=C0103
14
15=== modified file 'ubuntuone/controlpanel/logger.py'
16--- ubuntuone/controlpanel/logger.py 2011-01-24 13:11:51 +0000
17+++ ubuntuone/controlpanel/logger.py 2011-07-28 13:44:05 +0000
18@@ -26,7 +26,8 @@
19 from logging.handlers import RotatingFileHandler
20
21 # pylint: disable=F0401,E0611
22-from ubuntuone.logger import LOGFOLDER, LOGBACKUP, basic_formatter
23+from ubuntuone.logger import LOGBACKUP, basic_formatter
24+from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
25
26
27 if os.environ.get('DEBUG'):
28@@ -35,7 +36,8 @@
29 # Only log this level and above
30 LOG_LEVEL = logging.DEBUG # before final release, switch to INFO
31
32-MAIN_HANDLER = RotatingFileHandler(os.path.join(LOGFOLDER, 'controlpanel.log'),
33+FILE_NAME = os.path.join(ubuntuone_log_dir, 'controlpanel.log')
34+MAIN_HANDLER = RotatingFileHandler(FILE_NAME,
35 maxBytes=1048576,
36 backupCount=LOGBACKUP)
37 MAIN_HANDLER.setFormatter(basic_formatter)

Subscribers

People subscribed via source and target branches