Skip to content

Commit

Permalink
削除時の確認ダイアログに関する設定項目を追加 refs #184
Browse files Browse the repository at this point in the history
  • Loading branch information
@nodaguti
nodaguti committed Dec 10, 2014
1 parent a1dc8be commit 7b425db
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 55 deletions.
12 changes: 7 additions & 5 deletions chaika/chrome/content/chaika/settings/abone-manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,14 @@ AboneManagerView.prototype = {
remove: function(){
if(this._listbox.selectedIndex === -1) return;

let rv;
let rv = true;

if(this._listbox.selectedItems.length > 1){
rv = window.confirm(this._listbox.selectedItems.length + ' 件のデータを削除してもよろしいですか？');
}else{
rv = window.confirm(this._listbox.selectedItem.label + ' を削除してもよろしいですか？');
if(ChaikaCore.pref.getBool('abone.warn_when_delete')){
if(this._listbox.selectedItems.length > 1){
rv = window.confirm(this._listbox.selectedItems.length + ' 件のデータを削除してもよろしいですか？');
}else{
rv = window.confirm(this._listbox.selectedItem.label + ' を削除してもよろしいですか？');
}
}

if(rv){
Expand Down
13 changes: 9 additions & 4 deletions chaika/chrome/content/chaika/settings/general-pane.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
<preference id="extensions.chaika.http_proxy_value"
name="extensions.chaika.http_proxy_value"
type="unichar"/>
<preference id="extensions.chaika.replace.warn_when_delete"
name="extensions.chaika.replace.warn_when_delete"
type="bool" />
</preferences>

<script type="application/x-javascript; version=1.7"
Expand All @@ -41,13 +44,13 @@
<caption class="setting-description" label="ログ" />
<vbox>
<checkbox label="ログを削除するときに警告する"
preference="extensions.chaika.warn_when_delete_log" />
preference="extensions.chaika.warn_when_delete_log" />
<checkbox label="ログファイルの位置を指定する *"
preference="extensions.chaika.appoint_data_dir" control="txtDataDir"/>
preference="extensions.chaika.appoint_data_dir" control="txtDataDir"/>
<hbox id="boxDataDir" class="indent" flex="1" align="start">
<textbox id="txtDataDir" flex="8"
preference="extensions.chaika.data_dir"
onsyncfrompreference="return gGeneralPane.readDataDirPref()"/>
preference="extensions.chaika.data_dir"
onsyncfrompreference="return gGeneralPane.readDataDirPref()"/>
<button id="btnDataDirSelect" label="参照..."
oncommand="gGeneralPane.selectDataDir()"/>
<spacer flex="1"/>
Expand Down Expand Up @@ -90,6 +93,8 @@
<vbox align="start">
<button label="置換マネージャ..."
oncommand="gGeneralPane.openReplacementManager()" />
<checkbox label="項目を削除するときに警告する"
preference="extensions.chaika.replace.warn_when_delete" />
</vbox>
</groupbox>

Expand Down
14 changes: 8 additions & 6 deletions chaika/chrome/content/chaika/settings/replacement-manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,14 @@ var gReplacementManager = {
remove: function(){
if(this._listbox.selectedIndex === -1) return;

let rv;

if(this._listbox.selectedItems.length > 1){
rv = window.confirm(this._listbox.selectedItems.length + ' 件のデータを削除してもよろしいですか？');
}else{
rv = window.confirm(this._listbox.selectedItem.label + ' を削除してもよろしいですか？');
let rv = true;

if(ChaikaCore.pref.getBool('replace.warn_when_delete')){
if(this._listbox.selectedItems.length > 1){
rv = window.confirm(this._listbox.selectedItems.length + ' 件のデータを削除してもよろしいですか？');
}else{
rv = window.confirm(this._listbox.selectedItem.label + ' を削除してもよろしいですか？');
}
}

if(rv){
Expand Down
78 changes: 42 additions & 36 deletions chaika/chrome/content/chaika/settings/thread-pane.xul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,34 @@
<!-- See license.txt for terms of usage -->

<overlay id="threadPaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">


<prefpane id="paneThread" onpaneload="gThreadPane.startup()">

<preferences>
<preference id="extensions.chaika.thread_skin"
name="extensions.chaika.thread_skin" type="unichar"/>
name="extensions.chaika.thread_skin" type="unichar"/>
<preference id="extensions.chaika.thread_show_be_icon"
name="extensions.chaika.thread_show_be_icon" type="bool"/>
name="extensions.chaika.thread_show_be_icon" type="bool"/>
<preference id="extensions.chaika.thread_font_name"
name="extensions.chaika.thread_font_name" type="unichar"/>
name="extensions.chaika.thread_font_name" type="unichar"/>
<preference id="extensions.chaika.thread_font_size"
name="extensions.chaika.thread_font_size" type="int"/>
name="extensions.chaika.thread_font_size" type="int"/>
<preference id="extensions.chaika.thread_aa_font_name"
name="extensions.chaika.thread_aa_font_name" type="unichar"/>
name="extensions.chaika.thread_aa_font_name" type="unichar"/>
<preference id="extensions.chaika.thread_aa_font_size"
name="extensions.chaika.thread_aa_font_size" type="int"/>
name="extensions.chaika.thread_aa_font_size" type="int"/>
<preference id="extensions.chaika.thread_aa_line_space"
name="extensions.chaika.thread_aa_line_space" type="int"/>
name="extensions.chaika.thread_aa_line_space" type="int"/>
<preference id="extensions.chaika.abone.warn_when_delete"
name="extensions.chaika.abone.warn_when_delete" type="bool" />
<preference id="extensions.chaika.thread_hide_abone"
name="extensions.chaika.thread_hide_abone" type="bool"/>
name="extensions.chaika.thread_hide_abone" type="bool"/>
<preference id="extensions.chaika.thread_chain_abone"
name="extensions.chaika.thread_chain_abone" type="bool"/>
name="extensions.chaika.thread_chain_abone" type="bool"/>
<preference id="extensions.chaika.refController.enabled"
name="extensions.chaika.refController.enabled" type="bool"/>
name="extensions.chaika.refController.enabled" type="bool"/>
</preferences>

<script type="application/x-javascript; version=1.7"
Expand All @@ -45,64 +47,67 @@
<button label="スキンフォルダを開く" oncommand="gThreadPane.openSkinDir()"/>
</hbox>
<checkbox label="Be アイコンの表示"
preference="extensions.chaika.thread_show_be_icon"/>
preference="extensions.chaika.thread_show_be_icon"/>
</vbox>
</groupbox>

<groupbox>
<caption class="setting-description" label="フォント" />
<vbox>
<hbox align="center">
<button label="フォント" oncommand="gThreadPane.openFontPreview(this, 'fontPanel')"/>
<button label="フォント" oncommand="gThreadPane.openFontPreview(this, 'fontPanel')"/>
</hbox>
<hbox align="center">
<button label="AA用フォント" oncommand="gThreadPane.openFontPreview(this, 'aaFontPanel')"/>
<label value="(対応スキンでのみ有効)"/>
<description value="(対応スキンでのみ有効)"/>
</hbox>

<popupset>
<panel id="fontPanel" position="after_start">
<hbox align="center">
<menulist id="lstThreadFontList"
preference="extensions.chaika.thread_font_name"
onselect="gThreadPane.setFontPreviewBoxFont()">
preference="extensions.chaika.thread_font_name"
onselect="gThreadPane.setFontPreviewBoxFont()">
<menupopup>
<menuitem label="明朝体 (Serif)" value="serif"/>
<menuitem label="ゴシック体 (Sans-serif)" value="sans-serif"/>
<menuitem label="等幅 (Monospace)" value="monospace"/>
<menuseparator/>
</menupopup>
</menulist>

<label value="サイズ :"/>
<textbox id="fontSize" value="16" type="number" min="8" max="32" style="width:3.5em;"
preference="extensions.chaika.thread_font_size"
onchange="gThreadPane.setFontPreviewBoxFont()"/>
<textbox id="fontSize" type="number" min="8" max="32"
preference="extensions.chaika.thread_font_size"
onchange="gThreadPane.setFontPreviewBoxFont()"/>
</hbox>
<textbox id="fontPreview" multiline="true" wrap="off"
value="" style="width:420px; height:180px; padding:5px;" flex="1"/>
<textbox id="fontPreview" multiline="true" wrap="off" flex="1"/>
</panel>

<panel id="aaFontPanel" position="after_start">
<hbox align="center">
<menulist id="lstThreadAAFontList" sizetopopup="none" style="width:12em;"
preference="extensions.chaika.thread_aa_font_name"
onselect="gThreadPane.setAAFontPreviewBoxFont()">
<menulist id="lstThreadAAFontList" sizetopopup="none"
preference="extensions.chaika.thread_aa_font_name"
onselect="gThreadPane.setAAFontPreviewBoxFont()">
<menupopup>
<menuitem label="明朝体 (Serif)" value="serif"/>
<menuitem label="ゴシック体 (Sans-serif)" value="sans-serif"/>
<menuitem label="等幅 (Monospace)" value="monospace"/>
<menuseparator/>
</menupopup>
</menulist>

<label value="サイズ :"/>
<textbox id="aaFontSize" value="16" type="number" min="8" max="32" style="width:3.5em;"
preference="extensions.chaika.thread_aa_font_size"
onchange="gThreadPane.setAAFontPreviewBoxFont()"/>
<textbox id="aaFontSize" type="number" min="8" max="32"
preference="extensions.chaika.thread_aa_font_size"
onchange="gThreadPane.setAAFontPreviewBoxFont()"/>

<label value="高さ :"/>
<textbox value="1" id="aaLineHeight" type="number" min="0" max="20" style="width:3.5em;"
preference="extensions.chaika.thread_aa_line_space"
onchange="gThreadPane.setAAFontPreviewBoxFont()"/>
<textbox id="aaLineHeight" type="number" min="0" max="20"
preference="extensions.chaika.thread_aa_line_space"
onchange="gThreadPane.setAAFontPreviewBoxFont()"/>
</hbox>
<textbox id="aaFontPreview" multiline="true" wrap="off"
value="" style="width:420px; height:180px; padding:5px;" flex="1"/>
<textbox id="aaFontPreview" multiline="true" wrap="off" flex="1"/>
</panel>
</popupset>
</vbox>
Expand All @@ -113,10 +118,12 @@
<vbox align="start">
<button label="あぼーんマネージャ..."
oncommand="gThreadPane.openAboneManager()"/>
<checkbox label="項目を削除するときに警告する"
preference="extensions.chaika.abone.warn_when_delete" />
<checkbox label="あぼーんしたレスを表示しない (透明あぼーん)"
preference="extensions.chaika.thread_hide_abone"/>
preference="extensions.chaika.thread_hide_abone"/>
<checkbox label="連鎖あぼーん"
preference="extensions.chaika.thread_chain_abone"/>
preference="extensions.chaika.thread_chain_abone"/>
</vbox>
</groupbox>

Expand All @@ -132,11 +139,10 @@
<caption class="setting-description" label="その他" />
<vbox>
<checkbox label="スレッド表示のリンクからはリファラを送らない"
preference="extensions.chaika.refController.enabled"/>
preference="extensions.chaika.refController.enabled"/>
</vbox>
</groupbox>

</prefpane>


</overlay>
17 changes: 17 additions & 0 deletions chaika/chrome/skin/classic/chaika/settings/settings.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,20 @@ description.setting-description {
font-size: 0.9em;
text-align: right;
}

#fontSize,
#aaFontSize,
#aaLineHeight{
width: 3.5em;
}

#fontPreview,
#aaFontPreview{
width: 420px;
height: 180px;
padding: 5px;
}

#lstThreadAAFontList{
width: 12em;
}
11 changes: 7 additions & 4 deletions chaika/defaults/preferences/chaika-pref.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ pref("extensions.chaika.http_proxy_value", "localhost:8080");
pref("extensions.chaika.tab_load_in_foreground", false);
pref("extensions.chaika.appoint_data_dir", false);
pref("extensions.chaika.data_dir", "");
pref("extensions.chaika.warn_when_delete_log", true);
pref("extensions.chaika.server_port.firefox", 8823);
pref("extensions.chaika.server_port.seamonkey", 8824);
pref("extensions.chaika.server_port.other", 8825);

pref("extensions.chaika.historymenu.board_max", 6);
pref("extensions.chaika.historymenu.thread_max", 6);

pref('extensions.chaika.replace.warn_when_delete', true);

pref("extensions.chaika.browser.redirector.enabled", false);
pref("extensions.chaika.browser.redirector.throw_bookmarks", false);
pref("extensions.chaika.browser.redirector.replace_view_limit", true);
Expand Down Expand Up @@ -98,13 +101,15 @@ pref("extensions.chaika.thread_font_size", 16);
pref("extensions.chaika.thread_aa_font_name", "sans-serif");
pref("extensions.chaika.thread_aa_font_size", 16);
pref("extensions.chaika.thread_aa_line_space", 2);
pref("extensions.chaika.thread_hide_abone", false);
pref("extensions.chaika.thread_chain_abone", false);
pref("extensions.chaika.thread_show_be_icon", false);
pref("extensions.chaika.thread_get_log_from_mimizun", false);
pref("extensions.chaika.thread_alert_got_log", true);
pref("extensions.chaika.thread_fix_invalid_anchor", false);

pref('extensions.chaika.abone.warn_when_delete', true);
pref("extensions.chaika.thread_hide_abone", false);
pref("extensions.chaika.thread_chain_abone", false);

pref("extensions.chaika.post.thread_reload", true);
pref("extensions.chaika.post.auto_finish", false);
pref("extensions.chaika.post.auto_finish_delay", 750);
Expand All @@ -120,5 +125,3 @@ pref('extensions.chaika.post.emphasize_warnings', false);
pref('extensions.chaika.post.auto_be_enable', false);
pref('extensions.chaika.post.auto_be_disable', false);
pref('extensions.chaika.post.auto_p2_disable', false);

pref("extensions.chaika.warn_when_delete_log", true);

0 comments on commit 7b425db

Please sign in to comment.