Skip to content

Commit

Permalink
fixes #382
Browse files Browse the repository at this point in the history
  • Loading branch information
@inbasic
inbasic committed Jan 16, 2016
1 parent 04ab09f commit dccef2a
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 22 deletions.
Binary file modified builds/packed/firefox.xpi
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion src/_locales/en/messages.json
View file
Expand Up @@ -251,7 +251,9 @@
"options_notifications_29": {
"message": "This option is related to the right click menu on the toolbar button -> disable all notifications -> custom time period."
},

"options_notifications_30": {
"message": "Combine all concurrent desktop notifications into a single notification"
},
"options_tab": {
"message": "Tab Opening:"
},
Expand Down
44 changes: 24 additions & 20 deletions src/data/options/index.html
View file
Expand Up @@ -99,7 +99,7 @@
<td data-l10n-id="options_notifications"></td>
<td>
<label>
<input type="checkbox" data-pref="notification.show"> <span data-l10n-id="options_notifications_1"></span>
<span data-l10n-id="options_notifications_1"></span> <input type="checkbox" data-pref="notification.show">
</label>
<p class="spacer"></p>
<span data-l10n-id="options_notifications_2"></span> <input data-pref="notification.time" type="number" min="3"></input>
Expand All @@ -115,23 +115,23 @@
<p class="note" data-l10n-id="options_notifications_8"></p>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="notification.sound.play"> <span data-l10n-id="options_notifications_9"></span>
<span data-l10n-id="options_notifications_9"></span> <input type="checkbox" data-pref="notification.sound.play">
</label>
<p class="note only-mac" data-l10n-id="options_notifications_10"></p>
<p class="spacer"></p>
<div class="only-firefox">
<label>
<input type="checkbox" data-pref="tray.show"> <span data-l10n-id="options_notifications_11"></span>
<span data-l10n-id="options_notifications_11"></span> <input type="checkbox" data-pref="tray.show">
</label>
<p class="note" data-l10n-id="options_notifications_12"></p>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="tray.doTrayCallback"> <span data-l10n-id="options_notifications_13"></span>
<span data-l10n-id="options_notifications_13"></span> <input type="checkbox" data-pref="tray.doTrayCallback">
</label>
<p class="note" data-l10n-id="options_notifications_14"></p>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="tray.permanent"> <span data-l10n-id="options_notifications_26"></span>
<span data-l10n-id="options_notifications_26"></span> <input type="checkbox" data-pref="tray.permanent">
</label>
<p class="note" data-l10n-id="options_notifications_27"></p>
<p class="spacer"></p>
Expand Down Expand Up @@ -161,34 +161,38 @@
<span data-l10n-id="options_notifications_28"></span> <input data-pref="notification.silentTime" type="number" min="1" max="1000"></input>
<br/>
<p class="note" data-l10n-id="options_notifications_29"></p>
<p class="spacer"></p>
<label>
<span data-l10n-id="options_notifications_30"></span> <input type="checkbox" data-pref="notification.combined">
</label>
</td>
</tr>
<tr>
<td data-l10n-id="options_tab"></td>
<td>
<label>
<input type="checkbox" data-pref="tabs.search"> <span data-l10n-id="options_tab_1"></span>
<span data-l10n-id="options_tab_1"></span> <input type="checkbox" data-pref="tabs.search">
</label>
<p class="note" data-l10n-id="options_tab_2"></p>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="tabs.open.relatedToCurrent"> <span data-l10n-id="options_tab_3"></span>
<span data-l10n-id="options_tab_3"></span> <input type="checkbox" data-pref="tabs.open.relatedToCurrent">
</label>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="tabs.open._current"> <span data-l10n-id="options_tab_4"></span>
<span data-l10n-id="options_tab_4"></span> <input type="checkbox" data-pref="tabs.open._current">
</label>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="tabs.open.background"> <span data-l10n-id="options_tab_5"></span>
<span data-l10n-id="options_tab_5"></span> <input type="checkbox" data-pref="tabs.open.background">
</label>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="tabs.open.useBlankTabs"> <span data-l10n-id="options_tab_7"></span>
<span data-l10n-id="options_tab_7"></span> <input type="checkbox" data-pref="tabs.open.useBlankTabs">
</label>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="tabs.open._newWindow"> <span data-l10n-id="options_tab_6"></span>
<span data-l10n-id="options_tab_6"></span> <input type="checkbox" data-pref="tabs.open._newWindow">
</label>
</td>
</tr>
Expand Down Expand Up @@ -218,12 +222,12 @@
<p class="note" data-l10n-id="options_toolbar_10"></p>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="popup.keyUp"> <span data-l10n-id="options_toolbar_11"></span>
<span data-l10n-id="options_toolbar_11"></span> <input type="checkbox" data-pref="popup.keyUp">
</label>
<p class="note" data-l10n-id="options_toolbar_12"></p>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="popup.display"> <span data-l10n-id="options_toolbar_13"></span>
<span data-l10n-id="options_toolbar_13"></span> <input type="checkbox" data-pref="popup.display">
</label>
<p class="note" data-l10n-id="options_toolbar_14"></p>
<div class="only-firefox">
Expand All @@ -242,11 +246,11 @@
<td data-l10n-id="options_misc"></td>
<td>
<label>
<input type="checkbox" data-pref="email.doReadOnArchive"/> <span data-l10n-id="options_gmail_8"></span>
<span data-l10n-id="options_gmail_8"></span> <input type="checkbox" data-pref="email.doReadOnArchive"/>
</label>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="email.alphabetic"> <span data-l10n-id="options_misc_1"></span>
<span data-l10n-id="options_misc_1"></span> <input type="checkbox" data-pref="email.alphabetic">
</label>
<p class="note" data-l10n-id="options_misc_2"></p>
<p class="spacer"></p>
Expand All @@ -260,29 +264,29 @@
</div>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="tabs.NotifyGmailIsOpen"> <span data-l10n-id="options_misc_6"></span>
<span data-l10n-id="options_misc_6"></span> <input type="checkbox" data-pref="tabs.NotifyGmailIsOpen">
</label>
<p class="spacer"></p>
<span data-l10n-id="options_misc_10"></span> <input data-pref="email.threatAsNew" type="number" min="0"></input>
<p class="note" data-l10n-id="options_misc_11"></p>
<p class="spacer"></p>
<div class="only-firefox">
<label>
<input type="checkbox" data-pref="ui.tooltip"> <span data-l10n-id="options_misc_12"></span>
<span data-l10n-id="options_misc_12"></span> <input type="checkbox" data-pref="ui.tooltip">
</label>
<p class="note" data-l10n-id="options_misc_13"></p>
<p class="spacer"></p>
</div>
<label>
<input type="checkbox" data-pref="ui.minimal"> <span data-l10n-id="options_misc_14"></span>
<span data-l10n-id="options_misc_14"></span> <input type="checkbox" data-pref="ui.minimal">
</label>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="welcome.notification"> <span data-l10n-id="options_misc_7"></span>
<span data-l10n-id="options_misc_7"></span> <input type="checkbox" data-pref="welcome.notification">
</label>
<p class="spacer"></p>
<label>
<input type="checkbox" data-pref="reset"> <span data-l10n-id="options_misc_8"></span>
<span data-l10n-id="options_misc_8"></span> <input type="checkbox" data-pref="reset">
</label>
<p class="spacer"></p>
</td>
Expand Down
3 changes: 3 additions & 0 deletions src/lib/common.js
View file
Expand Up @@ -379,6 +379,9 @@ var checkEmails = (function () {
.replace('[title]', shorten(e.title))
.replace(/\[break\]/g, '\n');
});
if (config.notification.combined) {
report = [report.join('\n\n')];
}
// Preparing the tooltip
var tooltip =
app.l10n('gmail') + '\n\n' +
Expand Down
6 changes: 6 additions & 0 deletions src/lib/config.js
View file
Expand Up @@ -227,6 +227,12 @@ config.notification = {
set show (val) {
app.storage.write('notification', val);
},
get combined () {
return app.storage.read('combined') === 'true' ? true : false;
},
set combined (val) {
app.storage.write('combined', val);
},
sound: {
get play () {
return app.storage.read('alert') === 'false' ? false : true;
Expand Down
1 change: 1 addition & 0 deletions src/locale/en-US.properties
View file
Expand Up @@ -81,6 +81,7 @@ options_notifications_26=Always show tray notification (Windows only)
options_notifications_27=Tray notification will be shown even if there is no unread message.
options_notifications_28=Disable all notifications for a custom time period (in minutes):
options_notifications_29=This option is related to the right click menu on the toolbar button -> disable all notifications -> custom time period.
options_notifications_30=Combine all concurrent desktop notifications into a single notification
options_tab=Tab Opening:
options_tab_1=Search for an open Gmail account only on the active window
options_tab_2=Do not search other browser windows for open Gmail accounts. If Gmail is not open in the active window, open a new tab.
Expand Down
1 change: 1 addition & 0 deletions src/locale/en.properties
View file
Expand Up @@ -81,6 +81,7 @@ options_notifications_26=Always show tray notification (Windows only)
options_notifications_27=Tray notification will be shown even if there is no unread message.
options_notifications_28=Disable all notifications for a custom time period (in minutes):
options_notifications_29=This option is related to the right click menu on the toolbar button -> disable all notifications -> custom time period.
options_notifications_30=Combine all concurrent desktop notifications into a single notification
options_tab=Tab Opening:
options_tab_1=Search for an open Gmail account only on the active window
options_tab_2=Do not search other browser windows for open Gmail accounts. If Gmail is not open in the active window, open a new tab.
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
View file
Expand Up @@ -4,7 +4,7 @@
"description": "Multiple label and account notifier for Google Mail (Gmail)",
"id": "jid0-GjwrPchS3Ugt7xydvqVK4DQk8Ls@jetpack",
"license": "mozilla public license 1.1",
"version": "0.6.2b2",
"version": "0.6.2b3",
"author": "InBasic",
"contributors": [
"CaTz",
Expand Down

0 comments on commit dccef2a

Please sign in to comment.