Changeset 20289 for platform

Show
Ignore:
Timestamp:
09/30/08 17:25:20 (7 weeks ago)
Author:
thorikawa
Message:

ブラウザ終了時に端末選択を解除する/しないをOptionsから切り替えられるようにした。

Location:
platform/firefox/FireMobileSimulator/trunk
Files:
3 added
12 modified

Legend:

Unmodified
Added
Removed

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/content/common/carrier.js

    r20267 r20289  
    1 /******************************************************************************* 
    2  * ***** BEGIN LICENSE BLOCK Version: GPL 3.0 FireMobileFimulator is a Firefox 
    3  * add-on that simulate web browsers of japanese mobile phones. Copyright (C) 
    4  * 2008 Takahiro Horikawa <horikawa.takahiro@gmail.com> 
    5  *  
    6  * This program is free software: you can redistribute it and/or modify it under 
    7  * the terms of the GNU General Public License as published by the Free Software 
    8  * Foundation, either version 3 of the License, or (at your option) any later 
    9  * version. 
    10  *  
    11  * This program is distributed in the hope that it will be useful, but WITHOUT 
    12  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
    13  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
    14  * details. 
    15  *  
    16  * You should have received a copy of the GNU General Public License along with 
    17  * this program. If not, see <http://www.gnu.org/licenses/>. ***** END LICENSE 
    18  * BLOCK ***** 
    19  */ 
     1/* ***** BEGIN LICENSE BLOCK Version: GPL 3.0 *****  
     2 * FireMobileFimulator is a Firefox add-on that simulate web browsers of  
     3 * japanese mobile phones. 
     4 * Copyright (C) 2008  Takahiro Horikawa <horikawa.takahiro@gmail.com> 
     5 * 
     6 * This program is free software: you can redistribute it and/or modify 
     7 * it under the terms of the GNU General Public License as published by 
     8 * the Free Software Foundation, either version 3 of the License, or 
     9 * (at your option) any later version. 
     10 * 
     11 * This program is distributed in the hope that it will be useful, 
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     14 * GNU General Public License for more details. 
     15 * 
     16 * You should have received a copy of the GNU General Public License 
     17 * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     18 * ***** END LICENSE BLOCK ***** */ 
    2019 
    2120// キャリア別の端末の設定 

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/content/common/pref.js

    r20267 r20289  
    1 /******************************************************************************* 
    2  * ***** BEGIN LICENSE BLOCK Version: GPL 3.0 FireMobileFimulator is a Firefox 
    3  * add-on that simulate web browsers of japanese mobile phones. Copyright (C) 
    4  * 2008 Takahiro Horikawa <horikawa.takahiro@gmail.com> 
    5  *  
    6  * This program is free software: you can redistribute it and/or modify it under 
    7  * the terms of the GNU General Public License as published by the Free Software 
    8  * Foundation, either version 3 of the License, or (at your option) any later 
    9  * version. 
    10  *  
    11  * This program is distributed in the hope that it will be useful, but WITHOUT 
    12  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
    13  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
    14  * details. 
    15  *  
    16  * You should have received a copy of the GNU General Public License along with 
    17  * this program. If not, see <http://www.gnu.org/licenses/>. ***** END LICENSE 
    18  * BLOCK ***** 
    19  */ 
     1/* ***** BEGIN LICENSE BLOCK Version: GPL 3.0 *****  
     2 * FireMobileFimulator is a Firefox add-on that simulate web browsers of  
     3 * japanese mobile phones. 
     4 * Copyright (C) 2008  Takahiro Horikawa <horikawa.takahiro@gmail.com> 
     5 * 
     6 * This program is free software: you can redistribute it and/or modify 
     7 * it under the terms of the GNU General Public License as published by 
     8 * the Free Software Foundation, either version 3 of the License, or 
     9 * (at your option) any later version. 
     10 * 
     11 * This program is distributed in the hope that it will be useful, 
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     14 * GNU General Public License for more details. 
     15 * 
     16 * You should have received a copy of the GNU General Public License 
     17 * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     18 * ***** END LICENSE BLOCK ***** */ 
    2019 
    2120var firemobilesimulator; 

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/content/mpc.js

    r20267 r20289  
    1 /******************************************************************************* 
    2  * ***** BEGIN LICENSE BLOCK Version: GPL 3.0 FireMobileFimulator is a Firefox 
    3  * add-on that simulate web browsers of japanese mobile phones. Copyright (C) 
    4  * 2008 ryster <ryster@php-develop.org> 
    5  *  
    6  * This program is free software: you can redistribute it and/or modify it under 
    7  * the terms of the GNU General Public License as published by the Free Software 
    8  * Foundation, either version 3 of the License, or (at your option) any later 
    9  * version. 
    10  *  
    11  * This program is distributed in the hope that it will be useful, but WITHOUT 
    12  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
    13  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
    14  * details. 
    15  *  
    16  * You should have received a copy of the GNU General Public License along with 
    17  * this program. If not, see <http://www.gnu.org/licenses/>. ***** END LICENSE 
    18  * BLOCK ***** 
    19  */ 
     1/* ***** BEGIN LICENSE BLOCK Version: GPL 3.0 *****  
     2 * FireMobileFimulator is a Firefox add-on that simulate web browsers of  
     3 * japanese mobile phones. 
     4 * Copyright (C) 2008  Takahiro Horikawa <horikawa.takahiro@gmail.com> 
     5 * 
     6 * This program is free software: you can redistribute it and/or modify 
     7 * it under the terms of the GNU General Public License as published by 
     8 * the Free Software Foundation, either version 3 of the License, or 
     9 * (at your option) any later version. 
     10 * 
     11 * This program is distributed in the hope that it will be useful, 
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     14 * GNU General Public License for more details. 
     15 * 
     16 * You should have received a copy of the GNU General Public License 
     17 * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     18 * ***** END LICENSE BLOCK ***** */ 
    2019 
    2120var firemobilesimulator; 

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/content/options/dialogs/device.js

    r20267 r20289  
     1/* ***** BEGIN LICENSE BLOCK Version: GPL 3.0 *****  
     2 * FireMobileFimulator is a Firefox add-on that simulate web browsers of  
     3 * japanese mobile phones. 
     4 * Copyright (C) 2008  Takahiro Horikawa <horikawa.takahiro@gmail.com> 
     5 * 
     6 * This program is free software: you can redistribute it and/or modify 
     7 * it under the terms of the GNU General Public License as published by 
     8 * the Free Software Foundation, either version 3 of the License, or 
     9 * (at your option) any later version. 
     10 * 
     11 * This program is distributed in the hope that it will be useful, 
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     14 * GNU General Public License for more details. 
     15 * 
     16 * You should have received a copy of the GNU General Public License 
     17 * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     18 * ***** END LICENSE BLOCK ***** */ 
     19 
    120var firemobilesimulator; 
    221if (!firemobilesimulator) 

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/content/options/options.js

    r20267 r20289  
     1/* ***** BEGIN LICENSE BLOCK Version: GPL 3.0 *****  
     2 * FireMobileFimulator is a Firefox add-on that simulate web browsers of  
     3 * japanese mobile phones. 
     4 * Copyright (C) 2008  Takahiro Horikawa <horikawa.takahiro@gmail.com> 
     5 * 
     6 * This program is free software: you can redistribute it and/or modify 
     7 * it under the terms of the GNU General Public License as published by 
     8 * the Free Software Foundation, either version 3 of the License, or 
     9 * (at your option) any later version. 
     10 * 
     11 * This program is distributed in the hope that it will be useful, 
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     14 * GNU General Public License for more details. 
     15 * 
     16 * You should have received a copy of the GNU General Public License 
     17 * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     18 * ***** END LICENSE BLOCK ***** */ 
     19 
    120var firemobilesimulator; 
    221if(!firemobilesimulator) firemobilesimulator = {}; 
    … …  
    96115        if(selectedPage.indexOf("general") != -1){ 
    97116                firemobilesimulator.options.initializeGeneral(); 
     117        }else if(selectedPage.indexOf("idno") != -1){ 
     118                firemobilesimulator.options.initializeIdno(); 
    98119        }else if(selectedPage.indexOf("devices") != -1){ 
    99120                firemobilesimulator.options.initializeDevices(); 
    … …  
    107128// Initializes the general page 
    108129firemobilesimulator.options.initializeGeneral = function() 
     130{ 
     131        var pageDocument = document.getElementById("msim-options-iframe").contentDocument; 
     132        pageDocument.getElementById("msim-checkbox-general-reset-device-onquit").checked = firemobilesimulator.common.pref.getBoolPref("msim.config.general.reset-device-onquit"); 
     133} 
     134 
     135// Initializes the general page 
     136firemobilesimulator.options.initializeIdno = function() 
    109137{ 
    110138        var pageDocument = document.getElementById("msim-options-iframe").contentDocument; 
    … …  
    179207        // If this is the general page 
    180208        if(iFrameSrc.indexOf("general") != -1){ 
    181                 dump("[msim]store generals.\n"); 
     209                dump("[msim]store general.\n"); 
     210                firemobilesimulator.options.optionsDataBoolean["msim.config.general.reset-device-onquit"]    = pageDocument.getElementById("msim-checkbox-general-reset-device-onquit").checked; 
     211                //Nothing to do 
     212        }else if(iFrameSrc.indexOf("idno") != -1){ 
     213                dump("[msim]store idno.\n"); 
    182214                firemobilesimulator.options.optionsDataString["msim.config.DC.uid"]    = pageDocument.getElementById("msim-textbox-docomo-uid").value; 
    183215                firemobilesimulator.options.optionsDataString["msim.config.DC.ser"]    = pageDocument.getElementById("msim-textbox-docomo-ser").value; 

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/content/options/options.xul

    r20267 r20289  
    2222                <listbox id="msim-page-list" onselect="firemobilesimulator.options.changePage(this)"> 
    2323                        <listitem label="&msim.options.general.label;" selected="true" value="chrome://msim/content/options/pages/general.xul" accesskey="g" /> 
     24                        <listitem label="&msim.options.idno.label;" value="chrome://msim/content/options/pages/idno.xul" accesskey="i" /> 
    2425                        <listitem label="&msim.options.devices.label;" value="chrome://msim/content/options/pages/devices.xul" accesskey="d" /> 
    2526                        <listitem label="&msim.options.gps.label;" value="chrome://msim/content/options/pages/gps.xul" accesskey="d" /> 

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/content/options/pages/general.xul

    r20267 r20289  
    88 
    99        <groupbox> 
    10                 <caption label="DoCoMo"/> 
     10                <caption label="&msim.options.general.quit.label;"/> 
    1111                <grid> 
    12                         <rows id="msim.options.device.rows"> 
     12                        <rows id="msim.options.general.quit.rows"> 
    1313                                <row align="center"> 
    14                                         <label control="msim-textbox-docomo-uid" value="UID" style="width:120px"/> 
    15                                         <textbox id="msim-textbox-docomo-uid" value="" size="30"/> 
    16                                 </row> 
    17                                 <row align="center"> 
    18                                         <label control="msim-textbox-docomo-ser" value="端末製造番号"/> 
    19                                         <textbox id="msim-textbox-docomo-ser" value="" size="30"/> 
    20                                 </row> 
    21                                 <row align="center"> 
    22                                         <label control="msim-textbox-docomo-icc" value="FOMAカード製造番号"/> 
    23                                         <textbox id="msim-textbox-docomo-icc" value="" size="30"/> 
    24                                 </row> 
    25                                 <row align="center"> 
    26                                         <label control="msim-textbox-docomo-guid" value="iモードID"/> 
    27                                         <textbox id="msim-textbox-docomo-guid" value="" size="30"/> 
    28                                 </row> 
    29                         </rows> 
    30                 </grid> 
    31         </groupbox> 
    32  
    33         <groupbox> 
    34                 <caption label="Au"/> 
    35                 <grid> 
    36                         <rows> 
    37                                 <row align="center"> 
    38                                         <label control="msim-textbox-au-uid" value="UID" style="width:120px"/> 
    39                                         <textbox id="msim-textbox-au-uid" value="" size="30"/> 
    40                                 </row> 
    41                         </rows> 
    42                 </grid> 
    43         </groupbox> 
    44  
    45         <groupbox> 
    46                 <caption label="SoftBank"/> 
    47                 <grid> 
    48                         <rows> 
    49                                 <row align="center"> 
    50                                         <label control="msim-textbox-softbank-uid" value="UID" style="width:120px"/> 
    51                                         <textbox id="msim-textbox-softbank-uid" value="" size="30"/> 
    52                                 </row> 
    53                                 <row align="center"> 
    54                                         <label control="msim-textbox-softbank-serial" value="端末製造番号"/> 
    55                                         <textbox id="msim-textbox-softbank-serial" value="" size="30"/> 
     14                                        <checkbox id="msim-checkbox-general-reset-device-onquit" label="&msim.options.general.quit.reset-device-onquit.label;"/> 
    5615                                </row> 
    5716                        </rows> 

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/content/overlay.js

    r20267 r20289  
    6767        } 
    6868 
    69         dump("windowcount:" + windowCount.toString() + "\n"); 
     69        dump("[msim]windowcount:" + windowCount.toString() + "\n"); 
    7070        if (windowCount == 0) { 
    71                 firemobilesimulator.core.resetDevice(); 
     71                var resetOnQuit = firemobilesimulator.common.pref.getBoolPref("msim.config.general.reset-device-onquit"); 
     72                if(resetOnQuit) firemobilesimulator.core.resetDevice(); 
    7273        } 
    7374 

  • platform/firefox/FireMobileSimulator/trunk/src/chrome/locale/ja/msim.dtd

    r19579 r20289  
    99<!ENTITY msim.options.title "オプション設定"> 
    1010<!ENTITY msim.options.general.label "全般"> 
     11<!ENTITY msim.options.idno.label "ID情報"> 
    1112<!ENTITY msim.options.devices.label "デバイス設定"> 
    1213<!ENTITY msim.options.gps.label "位置情報設定"> 
    1314<!ENTITY msim.options.pictogram.label "絵文字表示設定"> 
     15<!ENTITY msim.options.general.quit.label "終了"> 
     16<!ENTITY msim.options.general.quit.reset-device-onquit.label "ブラウザ終了時に端末選択を解除する"> 
    1417<!ENTITY msim.options.edit "編集する"> 
    1518<!ENTITY msim.options.delete "削除する"> 

  • platform/firefox/FireMobileSimulator/trunk/src/components/msimModifyHeaders.js

    r20284 r20289  
    1 /******************************************************************************* 
    2  * ***** BEGIN LICENSE BLOCK Version: GPL 3.0 FireMobileFimulator is a Firefox 
    3  * add-on that simulate web browsers of japanese mobile phones. Copyright (C) 
    4  * 2008 Takahiro Horikawa <horikawa.takahiro@gmail.com> 
    5  *  
    6  * This program is free software: you can redistribute it and/or modify it under 
    7  * the terms of the GNU General Public License as published by the Free Software 
    8  * Foundation, either version 3 of the License, or (at your option) any later 
    9  * version. 
    10  *  
    11  * This program is distributed in the hope that it will be useful, but WITHOUT 
    12  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
    13  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
    14  * details. 
    15  *  
    16  * You should have received a copy of the GNU General Public License along with 
    17  * this program. If not, see <http://www.gnu.org/licenses/>. ***** END LICENSE 
    18  * BLOCK ***** 
    19  */ 
     1/* ***** BEGIN LICENSE BLOCK Version: GPL 3.0 *****  
     2 * FireMobileFimulator is a Firefox add-on that simulate web browsers of  
     3 * japanese mobile phones. 
     4 * Copyright (C) 2008  Takahiro Horikawa <horikawa.takahiro@gmail.com> 
     5 * 
     6 * This program is free software: you can redistribute it and/or modify 
     7 * it under the terms of the GNU General Public License as published by 
     8 * the Free Software Foundation, either version 3 of the License, or 
     9 * (at your option) any later version. 
     10 * 
     11 * This program is distributed in the hope that it will be useful, 
     12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     14 * GNU General Public License for more details. 
     15 * 
     16 * You should have received a copy of the GNU General Public License 
     17 * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     18 * ***** END LICENSE BLOCK ***** */ 
    2019 
    2120const Cc = Components.classes; 

  • platform/firefox/FireMobileSimulator/trunk/src/defaults/preferences/msim.js

    r19736 r20289  
    11pref("msim.config.regist.enabled", true); 
    22pref("msim.config.initialized", false); 
     3 
     4pref("msim.config.general.reset-device-onquit", true); 
    35 
    46pref("msim.config.DC.uid", "01msimmsim00"); 

  • platform/firefox/FireMobileSimulator/trunk/test/uid/dc.html

    r19579 r20289  
    2323        <input type="submit" value="UID���M�e�X�g"> 
    2424</form> 
     25�摜�\���F<img src="a.jpg?uid=NULLGWDOCOMO" /> 
    2526</body> 
    2627</html>