From 2d041773984635072094e6b1a32d7eb6f7dda7d5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 11 Sep 2009 14:55:41 -0600 Subject: [PATCH] Disable cover browsing and tag view buttons when viewing books on device --- src/calibre/gui2/dialogs/config/__init__.py | 4 +--- src/calibre/gui2/main.py | 4 ++++ src/calibre/trac/plugins/templates/linux.html | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/dialogs/config/__init__.py b/src/calibre/gui2/dialogs/config/__init__.py index 217fbb09fa..6197fd4521 100644 --- a/src/calibre/gui2/dialogs/config/__init__.py +++ b/src/calibre/gui2/dialogs/config/__init__.py @@ -10,7 +10,7 @@ from PyQt4.Qt import QDialog, QListWidgetItem, QIcon, \ QDialogButtonBox, QTabWidget, QBrush, QLineEdit, \ QProgressDialog -from calibre.constants import islinux, iswindows, isosx +from calibre.constants import iswindows, isosx from calibre.gui2.dialogs.config.config_ui import Ui_Dialog from calibre.gui2 import qstring_to_unicode, choose_dir, error_dialog, config, \ ALL_COLUMNS, NONE, info_dialog, choose_files, \ @@ -358,8 +358,6 @@ class ConfigDialog(QDialog, Ui_Dialog): self.timeout.setValue(prefs['network_timeout']) self.roman_numerals.setChecked(rn) self.new_version_notification.setChecked(config['new_version_notification']) - if not islinux: - self.dirs_box.setVisible(False) column_map = config['column_map'] for col in column_map + [i for i in ALL_COLUMNS if i not in column_map]: diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index c73b6bd49a..59047c92dd 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -1546,12 +1546,16 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): self.view_menu.actions()[1].setEnabled(True) self.action_open_containing_folder.setEnabled(True) self.action_sync.setEnabled(True) + self.status_bar.tag_view_button.setEnabled(True) + self.status_bar.cover_flow_button.setEnabled(True) else: self.action_edit.setEnabled(False) self.action_convert.setEnabled(False) self.view_menu.actions()[1].setEnabled(False) self.action_open_containing_folder.setEnabled(False) self.action_sync.setEnabled(False) + self.status_bar.tag_view_button.setEnabled(False) + self.status_bar.cover_flow_button.setEnabled(False) def device_job_exception(self, job): diff --git a/src/calibre/trac/plugins/templates/linux.html b/src/calibre/trac/plugins/templates/linux.html index f5ac32392d..a166810b21 100644 --- a/src/calibre/trac/plugins/templates/linux.html +++ b/src/calibre/trac/plugins/templates/linux.html @@ -108,8 +108,7 @@ sudo python -c "import urllib2; exec urllib2.urlopen('http://status.calibre-eboo 
 wget -O- http://calibre.kovidgoyal.net/downloads/${app}-${version}.tar.gz | tar xvz 
 cd calibre*
-python setup.py build_ext && python setup.py build && sudo python setup.py install
-sudo calibre_postinstall
+sudo python setup.py install
Note that if your distribution does not have a correctly compiled libunrar.so, ${app} will not