[Pkg-mozext-commits] [sage-extension] 13/20: RC fixes
David Prévot
taffit at moszumanska.debian.org
Fri May 1 03:10:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag sage_1_2
in repository sage-extension.
commit 57bad95a824cb7f65682bbb61b54ace47b229e88
Author: Peter Andrews <petea at jhu.edu>
Date: Mon Jul 26 23:39:57 2004 +0000
RC fixes
---
src/sage/content/sage-Overlay.xul | 6 +++---
src/sage/content/sage.xul | 2 +-
src/sage/content/settings/settings.xul | 22 +++++++++-------------
src/sage/locale/en-US/sage.dtd | 2 +-
src/sage/skin/classic/sage-small.png | Bin 635 -> 641 bytes
src/sage/skin/classic/sage.png | Bin 1600 -> 1001 bytes
6 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/sage/content/sage-Overlay.xul b/src/sage/content/sage-Overlay.xul
index db8c3c5..51e4d93 100755
--- a/src/sage/content/sage-Overlay.xul
+++ b/src/sage/content/sage-Overlay.xul
@@ -8,9 +8,9 @@
<menuitem key="key_openSageSidebar" observes="viewSageSidebar"/>
</menupopup>
- <menupopup id="menu_ToolsPopup">
- <menuitem key="key_openSageSidebar" observes="viewSageSidebar"/>
- </menupopup>
+ <menupopup id="menu_ToolsPopup">
+ <menuitem key="key_openSageSidebar" observes="viewSageSidebar" position="1"/>
+ </menupopup>
<keyset id="mainKeyset">
<key id="key_openSageSidebar" command="viewSageSidebar"
diff --git a/src/sage/content/sage.xul b/src/sage/content/sage.xul
index 0b92d06..7087523 100755
--- a/src/sage/content/sage.xul
+++ b/src/sage/content/sage.xul
@@ -53,7 +53,7 @@
<menupopup>
<menuitem id="chkShowSearchBar" type="checkbox" persist="checked" label="&menu.showSearchBar;" oncommand="toggleShowSearchBar()"/>
<menuitem id="chkShowTooltip" type="checkbox" persist="checked" checked="true" label="&menu.showDescTooltip;"/>
- <menuitem id="chkShowFeedItemList" type="checkbox" persist="checked" label="&menu.showFeedItemList;" oncommand="toggleShowFeedItemList()"/>
+ <menuitem id="chkShowFeedItemList" type="checkbox" persist="checked" checked="true" label="&menu.showFeedItemList;" oncommand="toggleShowFeedItemList()"/>
<menuseparator/>
<menuitem label="&menu.manageRSSList;" oncommand="manageRSSList()"/>
<menuitem label="&menu.opmlImportExport;" oncommand="openOPMLWizard()"/>
diff --git a/src/sage/content/settings/settings.xul b/src/sage/content/settings/settings.xul
index ead6a6c..e783e60 100755
--- a/src/sage/content/settings/settings.xul
+++ b/src/sage/content/settings/settings.xul
@@ -20,19 +20,8 @@
<stringbundle id="strRes" src="chrome://sage/locale/sage.properties"/>
</stringbundleset>
-<hbox style="padding:5px 0px 10px 0px">
-<groupbox flex="1">
- <caption label="&selectFolder.label;"/>
- <menulist id="select-menu" oncommand="selectFolder(event);">
- <menupopup id="select-folder"/>
- </menulist>
-</groupbox>
-</hbox>
-
<groupbox>
<caption label="&settings.general.caption;"/>
- <checkbox id="chkAutoFeedTitle" label="&settings.autoFeedTitle.label;"/>
- <checkbox id="chkTwelveHourClock" label="&settings.twelveHourClock.label;"/>
<grid>
<columns>
<column/>
@@ -40,6 +29,12 @@
</columns>
<rows>
<row align="center">
+ <label value="&selectFolder.label;:"/>
+ <menulist id="select-menu" oncommand="selectFolder(event);">
+ <menupopup id="select-folder"/>
+ </menulist>
+ </row>
+ <row align="center">
<label value="&settings.feedItemOrder.label;:"/>
<menulist id="feedItemOrder">
<menupopup>
@@ -59,6 +54,8 @@
</row>
</rows>
</grid>
+ <checkbox id="chkAutoFeedTitle" label="&settings.autoFeedTitle.label;"/>
+ <checkbox id="chkTwelveHourClock" label="&settings.twelveHourClock.label;"/>
</groupbox>
<groupbox>
@@ -75,5 +72,4 @@
</vbox>
</groupbox>
-</dialog>
-
+</dialog>
\ No newline at end of file
diff --git a/src/sage/locale/en-US/sage.dtd b/src/sage/locale/en-US/sage.dtd
index 053b28c..5c04931 100755
--- a/src/sage/locale/en-US/sage.dtd
+++ b/src/sage/locale/en-US/sage.dtd
@@ -41,7 +41,7 @@
<!ENTITY settings.feedDiscoveryMode.exhaustive "Exhaustive">
<!ENTITY settings.feedDiscoveryMode.conservative "Conservative">
<!ENTITY settingWindow.title "Sage Settings">
-<!ENTITY selectFolder.label "Select Feed Folder">
+<!ENTITY selectFolder.label "Feed folder">
<!ENTITY openInContentsArea.caption "Feed Rendering">
<!ENTITY enableUserCss.label "Use custom CSS">
<!ENTITY browseCss.label "Browse...">
diff --git a/src/sage/skin/classic/sage-small.png b/src/sage/skin/classic/sage-small.png
index 355e368..0ba7942 100644
Binary files a/src/sage/skin/classic/sage-small.png and b/src/sage/skin/classic/sage-small.png differ
diff --git a/src/sage/skin/classic/sage.png b/src/sage/skin/classic/sage.png
index ee8e7e7..5cdf140 100644
Binary files a/src/sage/skin/classic/sage.png and b/src/sage/skin/classic/sage.png differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/sage-extension.git
More information about the Pkg-mozext-commits
mailing list