diff --git a/src/libprs500/gui2/Makefile b/src/libprs500/gui2/Makefile index 25af20ace6..593ee68ebf 100644 --- a/src/libprs500/gui2/Makefile +++ b/src/libprs500/gui2/Makefile @@ -1,7 +1,7 @@ all : main_ui.py images_rc.py main_ui.py : main.ui - pyuic4 main.ui | sed -s s/^.*Margin.*// | sed -e s/^.*boxlayout\.setObjectName.*// > main_ui.py + pyuic4 main.ui > main_ui.py images_rc.py : images.qrc images pyrcc4 images.qrc > images_rc.py diff --git a/src/libprs500/gui2/main_ui.py b/src/libprs500/gui2/main_ui.py index 69ee219ed1..3662ed0df8 100644 --- a/src/libprs500/gui2/main_ui.py +++ b/src/libprs500/gui2/main_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'main.ui' # -# Created: Wed Jun 6 19:26:17 2007 -# by: PyQt4 UI code generator 4-snapshot-20070530 +# Created: Thu Jun 7 08:58:03 2007 +# by: PyQt4 UI code generator 4-snapshot-20070606 # # WARNING! All changes made in this file will be lost! @@ -29,11 +29,8 @@ class Ui_MainWindow(object): self.hboxlayout = QtGui.QHBoxLayout() self.hboxlayout.setSpacing(6) - - - - - + self.hboxlayout.setMargin(0) + self.hboxlayout.setObjectName("hboxlayout") self.device_tree = DeviceView(self.centralwidget) @@ -68,10 +65,7 @@ class Ui_MainWindow(object): self.hboxlayout1 = QtGui.QHBoxLayout() self.hboxlayout1.setSpacing(6) - - - - + self.hboxlayout1.setMargin(0) self.hboxlayout1.setObjectName("hboxlayout1") self.label = QtGui.QLabel(self.centralwidget) @@ -172,10 +166,7 @@ class Ui_MainWindow(object): self.hboxlayout2 = QtGui.QHBoxLayout() self.hboxlayout2.setSpacing(6) - - - - + self.hboxlayout2.setMargin(0) self.hboxlayout2.setObjectName("hboxlayout2") self.book_cover = CoverDisplay(self.centralwidget) diff --git a/src/libprs500/gui2/progress.py b/src/libprs500/gui2/progress.py index 334569f614..5c0bb27cfb 100644 --- a/src/libprs500/gui2/progress.py +++ b/src/libprs500/gui2/progress.py @@ -20,12 +20,12 @@ from PyQt4.QtSvg import QSvgRenderer class RotatingIconEngine(QIconEngine): @staticmethod - def create_pixmaps(path, size=16, delta=10): + def create_pixmaps(path, size=16, delta=20): r = QSvgRenderer(path) if not r.isValid(): raise Exception(path + ' not valid svg') pixmaps = [] - for angle in range(0, 360, 10): + for angle in range(0, 360, delta): pm = QPixmap(size, size) pm.fill(QColor(0,0,0,0)) p = QPainter(pm)