Changeset ef50c12


Ignore:
Timestamp:
Feb 17, 2011 5:19:39 PM (9 years ago)
Author:
mathiasdm <mathiasdm@…>
Branches:
master
Children:
d4fce3b
Parents:
ecadbba
Message:

Added the option to disable desktopgui.

Location:
apps
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • apps/desktopgui/locale/messages_en.po

    recadbba ref50c12  
    99"Project-Id-Version: I2P desktopgui\n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2011-02-13 11:54+0000\n"
     11"POT-Creation-Date: 2011-02-16 17:10+0000\n"
    1212"PO-Revision-Date: 2010-06-15 14:09+0100\n"
    1313"Last-Translator: duck <duck@mail.i2p>\n"
     
    3030msgstr ""
    3131
    32 #: src/net/i2p/desktopgui/InternalTrayManager.java:25
     32#: src/net/i2p/desktopgui/InternalTrayManager.java:26
    3333msgid "Launch I2P Browser"
    3434msgstr ""
    3535
    36 #: src/net/i2p/desktopgui/InternalTrayManager.java:49
     36#: src/net/i2p/desktopgui/InternalTrayManager.java:50
     37msgid "Configure desktopgui"
     38msgstr ""
     39
     40#: src/net/i2p/desktopgui/InternalTrayManager.java:67
    3741msgid "Restart I2P"
    3842msgstr ""
    3943
    40 #: src/net/i2p/desktopgui/InternalTrayManager.java:67
     44#: src/net/i2p/desktopgui/InternalTrayManager.java:85
    4145msgid "Stop I2P"
    4246msgstr ""
     47
     48#. Translate interface
     49#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:26
     50msgid "Should tray icon be enabled?"
     51msgstr ""
  • apps/desktopgui/locale/messages_nl.po

    recadbba ref50c12  
    22msgstr ""
    33"Project-Id-Version: \n"
    4 "POT-Creation-Date: \n"
     4"Report-Msgid-Bugs-To: \n"
     5"POT-Creation-Date: 2011-02-16 17:10+0000\n"
    56"PO-Revision-Date: \n"
    67"Last-Translator: \n"
     
    910"Content-Type: text/plain; charset=utf-8\n"
    1011"Content-Transfer-Encoding: 8bit\n"
     12
    1113# NL
    12 
    1314#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
    1415msgid "Start I2P"
     
    2324msgstr "Bezig met starten"
    2425
    25 #: src/net/i2p/desktopgui/InternalTrayManager.java:25
     26#: src/net/i2p/desktopgui/InternalTrayManager.java:26
    2627msgid "Launch I2P Browser"
    2728msgstr "Start I2P Browser"
    2829
    29 #: src/net/i2p/desktopgui/InternalTrayManager.java:49
     30#: src/net/i2p/desktopgui/InternalTrayManager.java:50
     31msgid "Configure desktopgui"
     32msgstr ""
     33
     34#: src/net/i2p/desktopgui/InternalTrayManager.java:67
    3035msgid "Restart I2P"
    3136msgstr "I2P herstarten"
    3237
    33 #: src/net/i2p/desktopgui/InternalTrayManager.java:67
     38#: src/net/i2p/desktopgui/InternalTrayManager.java:85
    3439msgid "Stop I2P"
    3540msgstr "I2P stoppen"
    3641
     42#. Translate interface
     43#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:26
     44msgid "Should tray icon be enabled?"
     45msgstr ""
     46
    3747#~ msgid "Browser not found"
    3848#~ msgstr "Browser niet gevonden"
     49
    3950#~ msgid "The default browser for your system was not found."
    4051#~ msgstr "De standaard webbrowser voor je systeem werd niet gevonden."
    41 
  • apps/desktopgui/locale/messages_ru.po

    recadbba ref50c12  
    99"Project-Id-Version: I2P desktopgui\n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2011-02-14 18:14+0000\n"
     11"POT-Creation-Date: 2011-02-16 17:10+0000\n"
    1212"PO-Revision-Date: 2011-02-15 00:18+0500\n"
    1313"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
    1414"Language-Team: duck <duck@mail.i2p>\n"
    15 "Language: \n"
    1615"MIME-Version: 1.0\n"
    1716"Content-Type: text/plain; charset=UTF-8\n"
    1817"Content-Transfer-Encoding: 8bit\n"
     18"Language: \n"
    1919"Plural-Forms: nplurals=2; plural=(n != 1)\n"
    2020
     
    3232msgstr "Запускается"
    3333
    34 #: src/net/i2p/desktopgui/InternalTrayManager.java:25
     34#: src/net/i2p/desktopgui/InternalTrayManager.java:26
    3535msgid "Launch I2P Browser"
    3636msgstr "Запустить I2P браузер"
    3737
    38 #: src/net/i2p/desktopgui/InternalTrayManager.java:49
     38#: src/net/i2p/desktopgui/InternalTrayManager.java:50
     39msgid "Configure desktopgui"
     40msgstr ""
     41
     42#: src/net/i2p/desktopgui/InternalTrayManager.java:67
    3943msgid "Restart I2P"
    4044msgstr "Перезапустить I2P"
    4145
    42 #: src/net/i2p/desktopgui/InternalTrayManager.java:67
     46#: src/net/i2p/desktopgui/InternalTrayManager.java:85
    4347msgid "Stop I2P"
    4448msgstr "Остановить I2P"
    4549
     50#. Translate interface
     51#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:26
     52msgid "Should tray icon be enabled?"
     53msgstr ""
  • apps/desktopgui/locale/messages_zh.po

    recadbba ref50c12  
    33"Project-Id-Version: \n"
    44"Report-Msgid-Bugs-To: \n"
    5 "POT-Creation-Date: 2011-02-12 11:40+0000\n"
     5"POT-Creation-Date: 2011-02-16 17:10+0000\n"
    66"PO-Revision-Date: \n"
    77"Last-Translator: \n"
     
    2323msgstr "正在启动"
    2424
    25 #: src/net/i2p/desktopgui/InternalTrayManager.java:25
     25#: src/net/i2p/desktopgui/InternalTrayManager.java:26
    2626msgid "Launch I2P Browser"
    2727msgstr "正在启动I2P浏览器"
    2828
    29 #: src/net/i2p/desktopgui/InternalTrayManager.java:49
     29#: src/net/i2p/desktopgui/InternalTrayManager.java:50
     30msgid "Configure desktopgui"
     31msgstr ""
     32
     33#: src/net/i2p/desktopgui/InternalTrayManager.java:67
    3034msgid "Restart I2P"
    3135msgstr "重启 I2P"
    3236
    33 #: src/net/i2p/desktopgui/InternalTrayManager.java:67
     37#: src/net/i2p/desktopgui/InternalTrayManager.java:85
    3438msgid "Stop I2P"
    3539msgstr "停止 I2P"
     40
     41#. Translate interface
     42#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:26
     43msgid "Should tray icon be enabled?"
     44msgstr ""
    3645
    3746#~ msgid "Browser not found"
  • apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java

    recadbba ref50c12  
    77
    88import javax.swing.SwingWorker;
     9import net.i2p.desktopgui.gui.DesktopguiConfigurationFrame;
    910
    1011import net.i2p.desktopgui.router.RouterManager;
     
    4748            }
    4849        });
     50        MenuItem desktopguiConfigurationLauncher = new MenuItem(_("Configure desktopgui"));
     51        desktopguiConfigurationLauncher.addActionListener(new ActionListener() {
     52
     53            @Override
     54            public void actionPerformed(ActionEvent arg0) {
     55                new SwingWorker<Object, Object>() {
     56
     57                    @Override
     58                    protected Object doInBackground() throws Exception {
     59                        new DesktopguiConfigurationFrame().setVisible(true);
     60                        return null;
     61                    }
     62
     63                }.execute();
     64            }
     65
     66        });
    4967        MenuItem restartItem = new MenuItem(_("Restart I2P"));
    5068        restartItem.addActionListener(new ActionListener() {
     
    86104        popup.add(browserLauncher);
    87105        popup.addSeparator();
     106        popup.add(desktopguiConfigurationLauncher);
     107        popup.addSeparator();
    88108        popup.add(restartItem);
    89109        popup.add(stopItem);
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    recadbba ref50c12  
    330330            //ApplicationManager?
    331331            VersionComparator v = new VersionComparator();
    332             if(v.compare(System.getProperty("java.runtime.version"), "1.6") >= 0) {
     332            String desktopguiEnabled = I2PAppContext.getGlobalContext().getProperty("desktopgui.enabled");
     333            int recentJava = v.compare(System.getProperty("java.runtime.version"), "1.6");
     334            if(recentJava >= 0 && (desktopguiEnabled == null || desktopguiEnabled.equalsIgnoreCase("true"))) {
    333335                String[] args = new String[0];
    334336                net.i2p.desktopgui.Main.beginStartup(args);   
Note: See TracChangeset for help on using the changeset viewer.