From 7245db30cd6deca947bb97c58ed84f24be15c33d Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 13 Mar 2013 03:01:18 +0100 Subject: [PATCH] [qcineoob] cosmetics --- weboob/applications/qcineoob/main_window.py | 9 +- .../applications/qcineoob/ui/main_window.ui | 111 ++++++++++++++---- 2 files changed, 91 insertions(+), 29 deletions(-) diff --git a/weboob/applications/qcineoob/main_window.py b/weboob/applications/qcineoob/main_window.py index 36f0ac91..fefd66c3 100644 --- a/weboob/applications/qcineoob/main_window.py +++ b/weboob/applications/qcineoob/main_window.py @@ -52,7 +52,7 @@ class MainWindow(QtMainWindow): self.history = {'last_action':None,'action_list':[]} self.connect(self.ui.backButton, SIGNAL("clicked()"), self.doBack) - self.ui.backButton.setDisabled(True) + self.ui.backButton.hide() self.connect(self.ui.searchEdit, SIGNAL("returnPressed()"), self.search) self.connect(self.ui.typeCombo, SIGNAL("returnPressed()"), self.search) @@ -70,6 +70,7 @@ class MainWindow(QtMainWindow): for lang in langs: self.ui.langCombo.addItem(lang) self.ui.langCombo.hide() + self.ui.langLabel.hide() def backendsConfig(self): bckndcfg = BackendCfg(self.weboob, (ICapCinema,ICapTorrent,ICapSubtitle,), self) @@ -93,15 +94,17 @@ class MainWindow(QtMainWindow): def typeComboChanged(self,value): if unicode(value) == 'subtitle': self.ui.langCombo.show() + self.ui.langLabel.show() else: self.ui.langCombo.hide() + self.ui.langLabel.hide() def doAction(self, description, fun, args): self.ui.currentActionLabel.setText(description) if self.history['last_action'] != None: self.history['action_list'].append(self.history['last_action']) self.ui.backButton.setToolTip(self.history['last_action']['description']) - self.ui.backButton.setDisabled(False) + self.ui.backButton.show() self.history['last_action'] = {'function':fun,'args':args,'description':description} return fun(*args) @@ -111,7 +114,7 @@ class MainWindow(QtMainWindow): self.ui.currentActionLabel.setText(todo['description']) self.history['last_action'] = todo if len(self.history['action_list']) == 0: - self.ui.backButton.setDisabled(True) + self.ui.backButton.hide() else: self.ui.backButton.setToolTip(self.history['action_list'][-1]['description']) return todo['function'](*todo['args']) diff --git a/weboob/applications/qcineoob/ui/main_window.ui b/weboob/applications/qcineoob/ui/main_window.ui index 109ef933..77efd3c4 100644 --- a/weboob/applications/qcineoob/ui/main_window.ui +++ b/weboob/applications/qcineoob/ui/main_window.ui @@ -15,6 +15,9 @@ + + 4 + @@ -64,42 +67,98 @@ + + + + + 8 + + + + language + + + - - - - - 40 - 16777215 - - - - back - - - - - - - 75 - true - + + + QFrame::NoFrame - - - - - Qt::AlignCenter + + QFrame::Raised + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 60 + 20 + + + + <<back + + + + + + + + 75 + true + + + + + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -117,7 +176,7 @@ 0 0 708 - 293 + 292 @@ -138,7 +197,7 @@ 0 0 - 78 + 63 18