Index: trunk/ChameleonPrefPane/Sources/BootFlagsController.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/BootFlagsController.mm (revision 443) +++ trunk/ChameleonPrefPane/Sources/BootFlagsController.mm (revision 444) @@ -40,6 +40,7 @@ BootProp::instance().addOptionDesc(mRescanSingleDrive, nil, OptionYesNo, "Rescan SingleDrive", "No"); BootProp::instance().addOptionDesc(mUseGUI, nil, OptionYesNo, "GUI", "Yes"); BootProp::instance().addOptionDesc(mTheme, mThemeText, OptionString, "Theme", ""); + BootProp::instance().addOptionDesc(mKbdLayout, mKbdLayoutText, OptionString, "KeyLayout", ""); } //-------------------------------------------------------------------------- Index: trunk/ChameleonPrefPane/Sources/BootFlagsController.h =================================================================== --- trunk/ChameleonPrefPane/Sources/BootFlagsController.h (revision 443) +++ trunk/ChameleonPrefPane/Sources/BootFlagsController.h (revision 444) @@ -32,7 +32,9 @@ IBOutlet NSButton* mRescanSingleDrive; IBOutlet NSButton* mUseGUI; IBOutlet NSButton* mTheme; - IBOutlet NSComboBox* mThemeText; + IBOutlet NSComboBox* mThemeText; + IBOutlet NSButton* mKbdLayout; + IBOutlet NSComboBox* mKbdLayoutText; } - (IBAction) onCheckButtonChange: (NSButton*) sender; Index: trunk/ChameleonPrefPane/French.lproj/Chameleon.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/French.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/French.lproj/Chameleon.xib (revision 443) +++ trunk/ChameleonPrefPane/French.lproj/Chameleon.xib (revision 444) @@ -313,7 +313,7 @@ Item 1 - + 292 YES @@ -1020,6 +1020,7 @@ {541, 408} + 2 Démarrer De ... @@ -1679,7 +1680,7 @@ 12 - {{329, 142}, {175, 23}} + {{329, 88}, {175, 23}} 2 YES @@ -1699,6 +1700,29 @@ 25 + + + 12 + {{329, 144}, {175, 23}} + + 2 + YES + + 67239424 + 0 + Ignore caches (-f) + + + 1211912703 + 2 + + + + + 200 + 25 + + 12 @@ -1725,7 +1749,7 @@ 12 - {{329, 113}, {175, 23}} + {{329, 114}, {175, 23}} 2 YES @@ -1794,7 +1818,7 @@ 12 - {{329, 88}, {161, 23}} + {{329, 63}, {161, 23}} 2 YES @@ -1863,7 +1887,7 @@ 12 - {{164, 57}, {164, 23}} + {{164, 60}, {164, 23}} 2 YES @@ -1980,12 +2004,12 @@ 12 - {{16, 30}, {144, 23}} + {{16, 32}, {144, 23}} 2 YES - -2080244224 + 67239424 0 Thème Démarrage @@ -2000,10 +2024,33 @@ 25 + + + 12 + {{16, 6}, {144, 23}} + + 2 + YES + + 67239424 + 0 + Keyboard Layout + + + 1211912703 + 2 + + + + + 200 + 25 + + 268 - {{166, 27}, {134, 26}} + {{166, 32}, {134, 26}} 2 YES @@ -2084,6 +2131,90 @@ + + + 268 + {{166, 6}, {134, 26}} + + 2 + YES + + 343014976 + 272630784 + + + + YES + + + 5 + YES + + YES + mac-fr + mac-en + mac-ger + mac-it + mac-spa + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + {{1, 1}, {509, 184}} @@ -4575,7 +4706,7 @@ Item 7 - + 256 YES @@ -4765,7 +4896,6 @@ {541, 408} - 2 A Propos @@ -4773,14 +4903,14 @@ - + 268435462 YES YES YES - + @@ -5506,7 +5636,55 @@ 1439 + + onCheckButtonChange: + + + + 1442 + + + mIgnoreCaches + + + + 1443 + + + + onCheckButtonChange: + + + + 1446 + + + + onTextFiedChange: + + + + 1449 + + + + mKbdLayout + + + + 1450 + + + + mKbdLayoutText + + + + 1451 + + + mLegacyLogo @@ -8475,17 +8653,20 @@ YES - - - - + + + + + - - + + + + - + @@ -8713,6 +8894,48 @@ + + 1440 + + + YES + + + + + + 1441 + + + + + 1444 + + + YES + + + + + + 1445 + + + + + 1447 + + + YES + + + + + + 1448 + + + @@ -8858,6 +9081,15 @@ 1436.IBAttributePlaceholdersKey 1436.IBPluginDependency 1437.IBPluginDependency + 1440.IBAttributePlaceholdersKey + 1440.IBPluginDependency + 1441.IBPluginDependency + 1444.IBAttributePlaceholdersKey + 1444.IBPluginDependency + 1445.IBPluginDependency + 1447.IBAttributePlaceholdersKey + 1447.IBPluginDependency + 1448.IBPluginDependency 158.IBPluginDependency 160.IBPluginDependency 172.IBAttributePlaceholdersKey @@ -8874,6 +9106,7 @@ 285.IBAttributePlaceholdersKey 285.IBPluginDependency 286.CustomClassName + 286.IBAttributePlaceholdersKey 286.IBPluginDependency 292.IBAttributePlaceholdersKey 292.IBPluginDependency @@ -9086,6 +9319,7 @@ 869.IBAttributePlaceholdersKey 869.IBPluginDependency 870.IBPluginDependency + 872.IBAttributePlaceholdersKey 872.IBPluginDependency 873.IBComboBoxObjectValuesKey.objectValues 873.IBPluginDependency @@ -9335,7 +9569,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{63, 381}, {668, 439}} + {{67, 288}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -9476,9 +9710,39 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Ignore Boot Configuration file (default: No). If set, then org.chameleon.Boot.plist will not be loaded during the boot, only defaults options will be set. + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + InitialTabViewItem InitialTabViewItem @@ -9520,6 +9784,14 @@ com.apple.InterfaceBuilder.CocoaPlugin RoundedBox + + ToolTip + + ToolTip + + Permit to change the keyboard layout according to key layout name of the .lyt file in /Extra/Keymaps/*.lyt + + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -10122,6 +10394,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select a chameleon boot theme + + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -10191,7 +10471,7 @@ - 1439 + 1451 @@ -10562,7 +10842,10 @@ YES mIgnoreBootConfig + mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10584,11 +10867,14 @@ NSButton NSButton NSButton + NSComboBox NSButton NSButton NSButton NSButton NSButton + NSButton + NSButton NSComboBox NSButton NSTextField @@ -10603,7 +10889,10 @@ YES mIgnoreBootConfig + mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10626,10 +10915,22 @@ NSButton + mIgnoreCaches + NSButton + + mInstantMenu NSButton + mKbdLayout + NSButton + + + mKbdLayoutText + NSComboBox + + mQuietBoot NSButton Index: trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib (revision 443) +++ trunk/ChameleonPrefPane/Spanish.lproj/Chameleon.xib (revision 444) @@ -313,7 +313,7 @@ Item 1 - + 292 YES @@ -1020,6 +1020,7 @@ {541, 408} + 2 Arranque ... @@ -1679,7 +1680,7 @@ 12 - {{329, 142}, {175, 23}} + {{329, 88}, {175, 23}} 2 YES @@ -1699,6 +1700,29 @@ 25 + + + 12 + {{329, 144}, {175, 23}} + + 2 + YES + + 67239424 + 0 + Ignore caches (-f) + + + 1211912703 + 2 + + + + + 200 + 25 + + 12 @@ -1725,7 +1749,7 @@ 12 - {{329, 113}, {175, 23}} + {{329, 114}, {175, 23}} 2 YES @@ -1794,7 +1818,7 @@ 12 - {{329, 88}, {161, 23}} + {{329, 63}, {161, 23}} 2 YES @@ -1863,7 +1887,7 @@ 12 - {{164, 57}, {164, 23}} + {{164, 60}, {164, 23}} 2 YES @@ -1980,12 +2004,12 @@ 12 - {{16, 30}, {144, 23}} + {{16, 32}, {144, 23}} 2 YES - -2080244224 + 67239424 0 Tema de arranque @@ -2000,10 +2024,33 @@ 25 + + + 12 + {{16, 6}, {144, 23}} + + 2 + YES + + 67239424 + 0 + Keyboard Layout + + + 1211912703 + 2 + + + + + 200 + 25 + + 268 - {{166, 27}, {134, 26}} + {{166, 32}, {134, 26}} 2 YES @@ -2084,6 +2131,90 @@ + + + 268 + {{166, 6}, {134, 26}} + + 2 + YES + + 343014976 + 272630784 + + + + YES + + + 5 + YES + + YES + mac-fr + mac-en + mac-ger + mac-it + mac-spa + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + {{1, 1}, {509, 184}} @@ -4577,7 +4708,7 @@ Item 7 - + 256 YES @@ -4767,7 +4898,6 @@ {541, 408} - 2 About @@ -4775,14 +4905,14 @@ - + 268435462 YES YES YES - + @@ -5508,7 +5638,55 @@ 1439 + + onCheckButtonChange: + + + + 1442 + + + mIgnoreCaches + + + + 1443 + + + + onCheckButtonChange: + + + + 1446 + + + + onTextFiedChange: + + + + 1449 + + + + mKbdLayout + + + + 1450 + + + + mKbdLayoutText + + + + 1451 + + + mLegacyLogo @@ -8477,17 +8655,20 @@ YES - - - - + + + + + - - + + + + - + @@ -8715,6 +8896,48 @@ + + 1440 + + + YES + + + + + + 1441 + + + + + 1444 + + + YES + + + + + + 1445 + + + + + 1447 + + + YES + + + + + + 1448 + + + @@ -8860,6 +9083,15 @@ 1436.IBAttributePlaceholdersKey 1436.IBPluginDependency 1437.IBPluginDependency + 1440.IBAttributePlaceholdersKey + 1440.IBPluginDependency + 1441.IBPluginDependency + 1444.IBAttributePlaceholdersKey + 1444.IBPluginDependency + 1445.IBPluginDependency + 1447.IBAttributePlaceholdersKey + 1447.IBPluginDependency + 1448.IBPluginDependency 158.IBPluginDependency 160.IBPluginDependency 172.IBAttributePlaceholdersKey @@ -8876,6 +9108,7 @@ 285.IBAttributePlaceholdersKey 285.IBPluginDependency 286.CustomClassName + 286.IBAttributePlaceholdersKey 286.IBPluginDependency 292.IBAttributePlaceholdersKey 292.IBPluginDependency @@ -9088,6 +9321,7 @@ 869.IBAttributePlaceholdersKey 869.IBPluginDependency 870.IBPluginDependency + 872.IBAttributePlaceholdersKey 872.IBPluginDependency 873.IBComboBoxObjectValuesKey.objectValues 873.IBPluginDependency @@ -9340,7 +9574,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{63, 381}, {668, 439}} + {{67, 288}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -9481,9 +9715,39 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Ignore Boot Configuration file (default: No). If set, then org.chameleon.Boot.plist will not be loaded during the boot, only defaults options will be set. + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + InitialTabViewItem InitialTabViewItem @@ -9525,6 +9789,14 @@ com.apple.InterfaceBuilder.CocoaPlugin RoundedBox + + ToolTip + + ToolTip + + Permit to change the keyboard layout according to key layout name of the .lyt file in /Extra/Keymaps/*.lyt + + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -10127,6 +10399,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select a chameleon boot theme + + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -10196,7 +10476,7 @@ - 1439 + 1451 @@ -10567,7 +10847,10 @@ YES mIgnoreBootConfig + mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10589,11 +10872,14 @@ NSButton NSButton NSButton + NSComboBox NSButton NSButton NSButton NSButton NSButton + NSButton + NSButton NSComboBox NSButton NSTextField @@ -10608,7 +10894,10 @@ YES mIgnoreBootConfig + mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10631,10 +10920,22 @@ NSButton + mIgnoreCaches + NSButton + + mInstantMenu NSButton + mKbdLayout + NSButton + + + mKbdLayoutText + NSComboBox + + mQuietBoot NSButton Index: trunk/ChameleonPrefPane/German.lproj/Chameleon.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/German.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/German.lproj/Chameleon.xib (revision 443) +++ trunk/ChameleonPrefPane/German.lproj/Chameleon.xib (revision 444) @@ -313,7 +313,7 @@ Item 1 - + 292 YES @@ -1020,6 +1020,7 @@ {541, 408} + 2 Starte von ... @@ -1679,7 +1680,7 @@ 12 - {{329, 142}, {175, 23}} + {{329, 88}, {175, 23}} 2 YES @@ -1699,6 +1700,29 @@ 25 + + + 12 + {{329, 144}, {175, 23}} + + 2 + YES + + 67239424 + 0 + Ignore caches (-f) + + + 1211912703 + 2 + + + + + 200 + 25 + + 12 @@ -1725,7 +1749,7 @@ 12 - {{329, 113}, {175, 23}} + {{329, 114}, {175, 23}} 2 YES @@ -1794,7 +1818,7 @@ 12 - {{329, 88}, {161, 23}} + {{329, 63}, {161, 23}} 2 YES @@ -1863,7 +1887,7 @@ 12 - {{164, 57}, {164, 23}} + {{164, 60}, {164, 23}} 2 YES @@ -1980,12 +2004,12 @@ 12 - {{16, 30}, {144, 23}} + {{16, 32}, {144, 23}} 2 YES - -2080244224 + 67239424 0 Boot Theme @@ -2000,10 +2024,33 @@ 25 + + + 12 + {{16, 6}, {144, 23}} + + 2 + YES + + 67239424 + 0 + Keyboard Layout + + + 1211912703 + 2 + + + + + 200 + 25 + + 268 - {{166, 27}, {134, 26}} + {{166, 32}, {134, 26}} 2 YES @@ -2084,6 +2131,90 @@ + + + 268 + {{166, 6}, {134, 26}} + + 2 + YES + + 343014976 + 272630784 + + + + YES + + + 5 + YES + + YES + mac-fr + mac-en + mac-ger + mac-it + mac-spa + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + {{1, 1}, {509, 184}} @@ -4575,7 +4706,7 @@ Item 7 - + 256 YES @@ -4765,7 +4896,6 @@ {541, 408} - 2 Über @@ -4773,14 +4903,14 @@ - + 268435462 YES YES YES - + @@ -5506,7 +5636,55 @@ 1439 + + onCheckButtonChange: + + + + 1442 + + + mIgnoreCaches + + + + 1443 + + + + onCheckButtonChange: + + + + 1446 + + + + onTextFiedChange: + + + + 1449 + + + + mKbdLayout + + + + 1450 + + + + mKbdLayoutText + + + + 1451 + + + mLegacyLogo @@ -8475,17 +8653,20 @@ YES - - - - + + + + + - - + + + + - + @@ -8713,6 +8894,48 @@ + + 1440 + + + YES + + + + + + 1441 + + + + + 1444 + + + YES + + + + + + 1445 + + + + + 1447 + + + YES + + + + + + 1448 + + + @@ -8858,6 +9081,15 @@ 1436.IBAttributePlaceholdersKey 1436.IBPluginDependency 1437.IBPluginDependency + 1440.IBAttributePlaceholdersKey + 1440.IBPluginDependency + 1441.IBPluginDependency + 1444.IBAttributePlaceholdersKey + 1444.IBPluginDependency + 1445.IBPluginDependency + 1447.IBAttributePlaceholdersKey + 1447.IBPluginDependency + 1448.IBPluginDependency 158.IBPluginDependency 160.IBPluginDependency 172.IBAttributePlaceholdersKey @@ -8874,6 +9106,7 @@ 285.IBAttributePlaceholdersKey 285.IBPluginDependency 286.CustomClassName + 286.IBAttributePlaceholdersKey 286.IBPluginDependency 292.IBAttributePlaceholdersKey 292.IBPluginDependency @@ -9086,6 +9319,7 @@ 869.IBAttributePlaceholdersKey 869.IBPluginDependency 870.IBPluginDependency + 872.IBAttributePlaceholdersKey 872.IBPluginDependency 873.IBComboBoxObjectValuesKey.objectValues 873.IBPluginDependency @@ -9339,7 +9573,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{63, 381}, {668, 439}} + {{67, 288}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -9480,9 +9714,39 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Ignore Boot Configuration file (default: No). If set, then org.chameleon.Boot.plist will not be loaded during the boot, only defaults options will be set. + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + InitialTabViewItem InitialTabViewItem @@ -9524,6 +9788,14 @@ com.apple.InterfaceBuilder.CocoaPlugin RoundedBox + + ToolTip + + ToolTip + + Permit to change the keyboard layout according to key layout name of the .lyt file in /Extra/Keymaps/*.lyt + + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -10126,6 +10398,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select a chameleon boot theme + + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -10195,7 +10475,7 @@ - 1439 + 1451 @@ -10566,7 +10846,10 @@ YES mIgnoreBootConfig + mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10588,11 +10871,14 @@ NSButton NSButton NSButton + NSComboBox NSButton NSButton NSButton NSButton NSButton + NSButton + NSButton NSComboBox NSButton NSTextField @@ -10607,7 +10893,10 @@ YES mIgnoreBootConfig + mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10630,10 +10919,22 @@ NSButton + mIgnoreCaches + NSButton + + mInstantMenu NSButton + mKbdLayout + NSButton + + + mKbdLayoutText + NSComboBox + + mQuietBoot NSButton Index: trunk/ChameleonPrefPane/Italian.lproj/Chameleon.strings =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib (revision 443) +++ trunk/ChameleonPrefPane/Italian.lproj/Chameleon.xib (revision 444) @@ -313,7 +313,7 @@ Item 1 - + 292 YES @@ -1020,6 +1020,7 @@ {541, 408} + 2 Avvio da... @@ -1679,7 +1680,7 @@ 12 - {{329, 142}, {175, 23}} + {{329, 88}, {175, 23}} 2 YES @@ -1699,6 +1700,29 @@ 25 + + + 12 + {{329, 144}, {175, 23}} + + 2 + YES + + 67239424 + 0 + Ignore caches (-f) + + + 1211912703 + 2 + + + + + 200 + 25 + + 12 @@ -1725,7 +1749,7 @@ 12 - {{329, 113}, {175, 23}} + {{329, 114}, {175, 23}} 2 YES @@ -1794,7 +1818,7 @@ 12 - {{329, 88}, {161, 23}} + {{329, 63}, {161, 23}} 2 YES @@ -1863,7 +1887,7 @@ 12 - {{164, 57}, {164, 23}} + {{164, 60}, {164, 23}} 2 YES @@ -1980,12 +2004,12 @@ 12 - {{16, 30}, {144, 23}} + {{16, 32}, {144, 23}} 2 YES - -2080244224 + 67239424 0 Tema Avvio @@ -2000,10 +2024,33 @@ 25 + + + 12 + {{16, 6}, {144, 23}} + + 2 + YES + + 67239424 + 0 + Keyboard Layout + + + 1211912703 + 2 + + + + + 200 + 25 + + 268 - {{166, 27}, {134, 26}} + {{166, 32}, {134, 26}} 2 YES @@ -2084,6 +2131,90 @@ + + + 268 + {{166, 6}, {134, 26}} + + 2 + YES + + 343014976 + 272630784 + + + + YES + + + 5 + YES + + YES + mac-fr + mac-en + mac-ger + mac-it + mac-spa + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + {{1, 1}, {509, 184}} @@ -4575,7 +4706,7 @@ Item 7 - + 256 YES @@ -4765,7 +4896,6 @@ {541, 408} - 2 About @@ -4773,14 +4903,14 @@ - + 268435462 YES YES YES - + @@ -5506,7 +5636,55 @@ 1439 + + onCheckButtonChange: + + + + 1442 + + + mIgnoreCaches + + + + 1443 + + + + onCheckButtonChange: + + + + 1446 + + + + onTextFiedChange: + + + + 1449 + + + + mKbdLayout + + + + 1450 + + + + mKbdLayoutText + + + + 1451 + + + mLegacyLogo @@ -8475,17 +8653,20 @@ YES - - - - + + + + + - - + + + + - + @@ -8713,6 +8894,48 @@ + + 1440 + + + YES + + + + + + 1441 + + + + + 1444 + + + YES + + + + + + 1445 + + + + + 1447 + + + YES + + + + + + 1448 + + + @@ -8858,6 +9081,15 @@ 1436.IBAttributePlaceholdersKey 1436.IBPluginDependency 1437.IBPluginDependency + 1440.IBAttributePlaceholdersKey + 1440.IBPluginDependency + 1441.IBPluginDependency + 1444.IBAttributePlaceholdersKey + 1444.IBPluginDependency + 1445.IBPluginDependency + 1447.IBAttributePlaceholdersKey + 1447.IBPluginDependency + 1448.IBPluginDependency 158.IBPluginDependency 160.IBPluginDependency 172.IBAttributePlaceholdersKey @@ -8874,6 +9106,7 @@ 285.IBAttributePlaceholdersKey 285.IBPluginDependency 286.CustomClassName + 286.IBAttributePlaceholdersKey 286.IBPluginDependency 292.IBAttributePlaceholdersKey 292.IBPluginDependency @@ -9086,6 +9319,7 @@ 869.IBAttributePlaceholdersKey 869.IBPluginDependency 870.IBPluginDependency + 872.IBAttributePlaceholdersKey 872.IBPluginDependency 873.IBComboBoxObjectValuesKey.objectValues 873.IBPluginDependency @@ -9340,7 +9574,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{63, 381}, {668, 439}} + {{67, 288}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -9481,9 +9715,39 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Ignore Boot Configuration file (default: No). If set, then org.chameleon.Boot.plist will not be loaded during the boot, only defaults options will be set. + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + InitialTabViewItem InitialTabViewItem @@ -9525,6 +9789,14 @@ com.apple.InterfaceBuilder.CocoaPlugin RoundedBox + + ToolTip + + ToolTip + + Permit to change the keyboard layout according to key layout name of the .lyt file in /Extra/Keymaps/*.lyt + + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -10129,6 +10401,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select a chameleon boot theme + + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -10198,7 +10478,7 @@ - 1439 + 1451 @@ -10569,7 +10849,10 @@ YES mIgnoreBootConfig + mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10591,11 +10874,14 @@ NSButton NSButton NSButton + NSComboBox NSButton NSButton NSButton NSButton NSButton + NSButton + NSButton NSComboBox NSButton NSTextField @@ -10610,7 +10896,10 @@ YES mIgnoreBootConfig + mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10633,10 +10922,22 @@ NSButton + mIgnoreCaches + NSButton + + mInstantMenu NSButton + mKbdLayout + NSButton + + + mKbdLayoutText + NSComboBox + + mQuietBoot NSButton Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 443) +++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 444) @@ -1798,7 +1798,7 @@ 12 - {{329, 57}, {161, 23}} + {{329, 63}, {161, 23}} 2 YES @@ -1867,7 +1867,7 @@ 12 - {{164, 57}, {164, 23}} + {{164, 60}, {164, 23}} 2 YES @@ -1984,12 +1984,12 @@ 12 - {{16, 30}, {144, 23}} + {{16, 32}, {144, 23}} 2 YES - -2080244224 + 67239424 0 Boot Theme @@ -2004,10 +2004,33 @@ 25 + + + 12 + {{16, 6}, {144, 23}} + + 2 + YES + + 67239424 + 0 + Keyboard Layout + + + 1211912703 + 2 + + + + + 200 + 25 + + 268 - {{166, 27}, {134, 26}} + {{166, 32}, {134, 26}} 2 YES @@ -2088,6 +2111,90 @@ + + + 268 + {{166, 6}, {134, 26}} + + 2 + YES + + 343014976 + 272630784 + + + + YES + + + 5 + YES + + YES + mac-fr + mac-en + mac-ger + mac-it + mac-spa + + + + + 274 + {13, 105} + + + YES + + YES + + 10 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -765427712 + + + + 1 + 15 + 0 + YES + 0 + 1 + + + {{1, 1}, {509, 184}} @@ -6613,6 +6720,38 @@ 1443 + + + onCheckButtonChange: + + + + 1446 + + + + onTextFiedChange: + + + + 1449 + + + + mKbdLayout + + + + 1450 + + + + mKbdLayoutText + + + + 1451 + @@ -8495,18 +8634,20 @@ YES - - - - - + + + + + + + @@ -8748,6 +8889,34 @@ + + 1444 + + + YES + + + + + + 1445 + + + + + 1447 + + + YES + + + + + + 1448 + + + @@ -8907,6 +9076,14 @@ 1440.IBPluginDependency 1440.IBViewBoundsToFrameTransform 1441.IBPluginDependency + 1444.IBAttributePlaceholdersKey + 1444.IBPluginDependency + 1444.IBViewBoundsToFrameTransform + 1445.IBPluginDependency + 1447.IBAttributePlaceholdersKey + 1447.IBPluginDependency + 1447.IBViewBoundsToFrameTransform + 1448.IBPluginDependency 158.IBPluginDependency 160.IBPluginDependency 172.IBAttributePlaceholdersKey @@ -8925,6 +9102,7 @@ 285.IBAttributePlaceholdersKey 285.IBPluginDependency 286.CustomClassName + 286.IBAttributePlaceholdersKey 286.IBPluginDependency 286.IBViewBoundsToFrameTransform 292.IBAttributePlaceholdersKey @@ -8932,6 +9110,7 @@ 292.IBViewBoundsToFrameTransform 293.IBAttributePlaceholdersKey 293.IBPluginDependency + 293.IBViewBoundsToFrameTransform 294.IBAttributePlaceholdersKey 294.IBPluginDependency 294.IBViewBoundsToFrameTransform @@ -8939,6 +9118,7 @@ 300.IBPluginDependency 301.IBAttributePlaceholdersKey 301.IBPluginDependency + 301.IBViewBoundsToFrameTransform 302.IBAttributePlaceholdersKey 302.IBPluginDependency 302.IBViewBoundsToFrameTransform @@ -9138,8 +9318,11 @@ 868.IBPluginDependency 869.IBAttributePlaceholdersKey 869.IBPluginDependency + 869.IBViewBoundsToFrameTransform 870.IBPluginDependency + 872.IBAttributePlaceholdersKey 872.IBPluginDependency + 872.IBViewBoundsToFrameTransform 873.IBPluginDependency 893.IBPluginDependency 897.IBPluginDependency @@ -9395,9 +9578,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{23, 399}, {668, 439}} + {{67, 288}, {668, 439}} com.apple.InterfaceBuilder.CocoaPlugin - {{23, 399}, {668, 439}} + {{67, 288}, {668, 439}} {224.66399999999999, 10} com.apple.InterfaceBuilder.CocoaPlugin @@ -9567,9 +9750,35 @@ P4AAAL+AAABDpIAAwyMAAA com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBgAAAwdAAAA + com.apple.InterfaceBuilder.CocoaPlugin + ToolTip + + ToolTip + + Permit to change the keyboard layout nameed <layoutName> as defined in /Extra/Keymaps/<layoutName>.lyt + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDJgAAwegAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + InitialTabViewItem InitialTabViewItem @@ -9612,11 +9821,19 @@ ToolTip - UseKernelCache=Yes will load pre-linked kernel and will ignore E/E and S/L/E/Extensions.mkext + Permit to change the keyboard layout according to key layout name of the .lyt file in /Extra/Keymaps/*.lyt com.apple.InterfaceBuilder.CocoaPlugin RoundedBox + + ToolTip + + ToolTip + + Permit to change the keyboard layout according to key layout name of the .lyt file in /Extra/Keymaps/*.lyt + + com.apple.InterfaceBuilder.CocoaPlugin AUFQAABDSAAAA @@ -9642,6 +9859,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBgAAAwyMAAA + ToolTip @@ -9672,6 +9892,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBgAAAwqIAAA + ToolTip @@ -9682,7 +9905,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDpIAAwlQAAA + P4AAAL+AAABDpIAAwpwAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -9700,7 +9923,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDpIAAwwcAAA + P4AAAL+AAABBgAAAwwUAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -10108,7 +10331,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDpIAAwqIAAA + P4AAAL+AAABDJAAAwpwAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -10189,12 +10412,26 @@ ToolTip - Use quiet boot mode (no messages or prompt) (default=No) + Select a chameleon boot theme com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBgAAAwlQAAA + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Select a chameleon boot theme + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDJgAAwlQAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -10268,7 +10505,7 @@ - 1443 + 1451 @@ -10641,6 +10878,8 @@ mIgnoreBootConfig mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10662,12 +10901,14 @@ NSButton NSButton NSButton + NSComboBox NSButton NSButton NSButton NSButton NSButton NSButton + NSButton NSComboBox NSButton NSTextField @@ -10684,6 +10925,8 @@ mIgnoreBootConfig mIgnoreCaches mInstantMenu + mKbdLayout + mKbdLayoutText mQuietBoot mRescan mRescanPrompt @@ -10714,6 +10957,14 @@ NSButton + mKbdLayout + NSButton + + + mKbdLayoutText + NSComboBox + + mQuietBoot NSButton