summaryrefslogtreecommitdiff
authorCalum Lind <calumlind+deluge@gmail.com>2012-01-06 04:11:34 (GMT)
committer Calum Lind <calumlind+deluge@gmail.com>2012-01-06 15:44:38 (GMT)
commita5742f892dec22dc035afd203f8e297689a779c0 (patch) (side-by-side diff)
treef76acaf0447ac556ebd80e3b85cca2232bb6446a
parent01adb882eae653d1c28ff3d330a7041eaa0fc551 (diff)
downloaddeluge-a5742f89.zip
deluge-a5742f89.tar.gz
deluge-a5742f89.tar.bz2
Fix #1915 : Unable to stop the status bar from autohiding
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--deluge/ui/web/css/deluge.css14
-rw-r--r--deluge/ui/web/js/deluge-all/UI.js18
-rw-r--r--deluge/ui/web/js/deluge-all/details/DetailsPanel.js8
3 files changed, 32 insertions, 8 deletions
diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css
index 9684066..d44c7ca 100644
--- a/deluge/ui/web/css/deluge.css
+++ b/deluge/ui/web/css/deluge.css
@@ -122,6 +122,20 @@ dl.singleline dd {
width: auto;
}
+.detailsPanel .x-panel-header {
+ height: 0;
+ padding: 0;
+ border: 0;
+}
+
+.detailsPanel .x-tool {
+ height: 15px;
+ z-index: 1;
+ position: fixed;
+ right: 0;
+ margin: 5px 10px;
+}
+
/* Login Window */
.x-deluge-login-window-icon {
background: url('../icons/login.png') no-repeat 2px;
diff --git a/deluge/ui/web/js/deluge-all/UI.js b/deluge/ui/web/js/deluge-all/UI.js
index d393c78..6f7ecd8 100644
--- a/deluge/ui/web/js/deluge-all/UI.js
+++ b/deluge/ui/web/js/deluge-all/UI.js
@@ -56,6 +56,22 @@ deluge.ui = {
deluge.sidebar = new Deluge.Sidebar();
deluge.statusbar = new Deluge.Statusbar();
+ this.detailsPanel = new Ext.Panel({
+ id: 'detailsPanel',
+ cls: 'detailsPanel',
+ region: 'south',
+ split: true,
+ height: 215,
+ minSize: 100,
+ collapsible: true,
+ margins: '0 5 5 5',
+ cmargins: '0 5 5 5',
+ layout: 'fit',
+ items: [
+ deluge.details
+ ],
+ });
+
this.MainPanel = new Ext.Panel({
id: 'mainPanel',
iconCls: 'x-deluge-main-panel',
@@ -63,7 +79,7 @@ deluge.ui = {
tbar: deluge.toolbar,
items: [
deluge.sidebar,
- deluge.details,
+ this.detailsPanel,
deluge.torrents
],
bbar: deluge.statusbar
diff --git a/deluge/ui/web/js/deluge-all/details/DetailsPanel.js b/deluge/ui/web/js/deluge-all/details/DetailsPanel.js
index 0ac556e..4ab35a9 100644
--- a/deluge/ui/web/js/deluge-all/details/DetailsPanel.js
+++ b/deluge/ui/web/js/deluge-all/details/DetailsPanel.js
@@ -36,15 +36,9 @@ Ext.namespace('Deluge.details');
*/
Deluge.details.DetailsPanel = Ext.extend(Ext.TabPanel, {
- region: 'south',
id: 'torrentDetails',
- split: true,
- height: 210,
- minSize: 100,
- collapsible: true,
- margins: '0 5 5 5',
activeTab: 0,
-
+
initComponent: function() {
Deluge.details.DetailsPanel.superclass.initComponent.call(this);
this.add(new Deluge.details.StatusTab());