Ticket #5169: case-server+kits.diff
File case-server+kits.diff, 41.2 KB (added by , 14 years ago) |
---|
-
src/servers/mail/install.sh
92 92 /boot/beos/system/servers/mail_daemon > /dev/null & 93 93 fi 94 94 95 alert "Finished installing" " Thanks"95 alert "Finished installing" "OK" -
src/servers/mail/DeskbarView.cpp
1 1 /* DeskbarView - mail_daemon's deskbar menu and view 2 2 * 3 3 * Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. 4 * Copyright 2009, Haiku, Inc. All rights reserved. 4 5 */ 5 6 6 7 … … 417 418 menu->SetFont(be_plain_font); 418 419 419 420 menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ( 420 "Create New Message", "N) 新規メッセージ作成")B_UTF8_ELLIPSIS,421 "Create new message", "N) 新規メッセージ作成")B_UTF8_ELLIPSIS, 421 422 new BMessage(MD_OPEN_NEW))); 422 423 menu->AddSeparatorItem(); 423 424 … … 525 526 526 527 if (modifiers() & B_SHIFT_KEY) { 527 528 BMenu *chainMenu = new BMenu( 528 MDR_DIALECT_CHOICE ("Check For Mails Only","R) メール受信のみ"));529 MDR_DIALECT_CHOICE ("Check for mails only","R) メール受信のみ")); 529 530 BFont font; 530 531 menu->GetFont(&font); 531 532 chainMenu->SetFont(&font); … … 551 552 // menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ( 552 553 // "Check For Mails Only","メール受信のみ"), new BMessage(MD_CHECK_FOR_MAILS))); 553 554 menu->AddItem(new BMenuItem( 554 MDR_DIALECT_CHOICE ("Send Pending Mails", "M) 保留メールを送信"),555 MDR_DIALECT_CHOICE ("Send pending mails", "M) 保留メールを送信"), 555 556 new BMessage(MD_SEND_MAILS))); 556 557 } else { 557 558 menu->AddItem(item = new BMenuItem( 558 MDR_DIALECT_CHOICE ("Check For Mail Now", "C) メールチェック"),559 MDR_DIALECT_CHOICE ("Check for mail now", "C) メールチェック"), 559 560 new BMessage(MD_CHECK_SEND_NOW))); 560 561 if (list.IsEmpty()) 561 562 item->SetEnabled(false); … … 563 564 564 565 menu->AddSeparatorItem(); 565 566 menu->AddItem(new BMenuItem( 566 MDR_DIALECT_CHOICE (" EditPreferences", "P) メール環境設定") B_UTF8_ELLIPSIS,567 MDR_DIALECT_CHOICE ("Preferences", "P) メール環境設定") B_UTF8_ELLIPSIS, 567 568 new BMessage(MD_OPEN_PREFS))); 568 569 569 570 if (modifiers() & B_SHIFT_KEY) { 570 571 menu->AddItem(new BMenuItem( 571 MDR_DIALECT_CHOICE ("Shutdown Mail Services", "Q) 終了"),572 MDR_DIALECT_CHOICE ("Shutdown mail services", "Q) 終了"), 572 573 new BMessage(B_QUIT_REQUESTED))); 573 574 } 574 575 -
src/servers/mail/install.japanese.sh
46 46 # This should be translated 47 47 if [[ `uname -m` == BePC ]] && test ! -e ~/config/lib/libssl.so; then 48 48 49 RETURN=`alert "You don't seem to have OpenSSL installed, which is required for IMAP." "Get OpenSSL" "I Don't Care"`49 RETURN=`alert "You don't seem to have OpenSSL installed, which is required for IMAP." "Get OpenSSL" "I don't care"` 50 50 51 51 if [[ $RETURN = "Get OpenSSL" ]] 52 52 then -
src/servers/media_addon/SystemTimeSource.cpp
1 1 /* 2 * Copyright (c) 2003-200 4, Marcus Overhagen <marcus@overhagen.de>2 * Copyright (c) 2003-2009, Marcus Overhagen <marcus@overhagen.de> 3 3 * All rights reserved. 4 4 * 5 5 * Redistribution and use in source and binary forms, with or without modification, … … 27 27 28 28 29 29 SystemTimeSource::SystemTimeSource() 30 : BMediaNode("System Clock"),30 : BMediaNode("System clock"), 31 31 BTimeSource(), 32 32 fControlThread(-1) 33 33 { … … 66 66 SystemTimeSource::NodeRegistered() 67 67 { 68 68 ASSERT(fControlThread == -1); 69 fControlThread = spawn_thread(_ControlThreadStart, "System Clock control", 12, this);69 fControlThread = spawn_thread(_ControlThreadStart, "System clock control", 12, this); 70 70 resume_thread(fControlThread); 71 71 } 72 72 -
src/servers/net/NetServer.cpp
257 257 NetServer::AboutRequested() 258 258 { 259 259 BAlert *alert = new BAlert("about", "Networking Server\n" 260 "\tCopyright " B_UTF8_COPYRIGHT "2006, Haiku.\n", "O k");260 "\tCopyright " B_UTF8_COPYRIGHT "2006, Haiku.\n", "OK"); 261 261 BTextView *view = alert->TextView(); 262 262 BFont font; 263 263 -
src/servers/print/ResourceManager.cpp
1 1 /* 2 * Copyright 2002-200 6, Haiku. All rights reserved.2 * Copyright 2002-2009, Haiku, Inc. All rights reserved. 3 3 * Distributed under the terms of the MIT License. 4 4 * 5 5 * Authors: … … 33 33 // or in case of "Preview" printer it 34 34 // is set on R5 to "NONE" IIRC and the Haiku 35 35 // preflet sets an empty string. 36 return !(fTransport == "Print To File"36 return !(fTransport == "Print to file" 37 37 || fTransport == "NONE" 38 38 || fTransport == ""); 39 39 } -
src/servers/print/ConfigWindow.cpp
103 103 104 104 ConfigWindow::ConfigWindow(config_setup_kind kind, Printer* defaultPrinter, 105 105 BMessage* settings, AutoReply* sender) 106 : BWindow(ConfigWindow::GetWindowFrame(), "Page Setup",106 : BWindow(ConfigWindow::GetWindowFrame(), "Page setup", 107 107 B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS) 108 108 , fKind(kind) 109 109 , fDefaultPrinter(defaultPrinter) … … 117 117 PrinterForMimeType(); 118 118 119 119 if (kind == kJobSetup) 120 SetTitle("Print Setup");120 SetTitle("Print setup"); 121 121 122 122 BView* panel = new BBox(Bounds(), "temporary", B_FOLLOW_ALL, B_WILL_DRAW); 123 123 AddChild(panel); … … 125 125 BRect dummyRect(0, 0, 1, 1); 126 126 127 127 // print selection pop up menu 128 BPopUpMenu* menu = new BPopUpMenu("Select a Printer");128 BPopUpMenu* menu = new BPopUpMenu("Select a printer"); 129 129 SetupPrintersMenu(menu); 130 130 131 131 fPrinters = new BMenuField("Printer:", menu, NULL); 132 132 133 133 // page format button 134 fPageSetup = AddPictureButton(panel, dummyRect, "Page Format", "PAGE_SETUP_ON",134 fPageSetup = AddPictureButton(panel, dummyRect, "Page format", "PAGE_SETUP_ON", 135 135 "PAGE_SETUP_OFF", MSG_PAGE_SETUP); 136 136 137 137 // add description to button 138 BStringView *pageFormatTitle = new BStringView("pageFormatTitle", "Paper Setup:");138 BStringView *pageFormatTitle = new BStringView("pageFormatTitle", "Paper setup:"); 139 139 fPageFormatText = new BStringView("pageFormatText", ""); 140 140 141 141 // page selection button 142 142 fJobSetup = NULL; 143 143 BStringView* jobSetupTitle = NULL; 144 144 if (kind == kJobSetup) { 145 fJobSetup = AddPictureButton(panel, dummyRect, "Page Selection", "JOB_SETUP_ON",145 fJobSetup = AddPictureButton(panel, dummyRect, "Page selection", "JOB_SETUP_ON", 146 146 "JOB_SETUP_OFF", MSG_JOB_SETUP); 147 147 // add description to button 148 jobSetupTitle = new BStringView("jobSetupTitle", "Pages to Print:");148 jobSetupTitle = new BStringView("jobSetupTitle", "Pages to print:"); 149 149 fJobSetupText = new BStringView("jobSetupText", ""); 150 150 } 151 151 … … 269 269 270 270 static const char* 271 271 kAbout = 272 "Printer Server\n"272 "Printer server\n" 273 273 "© 2001-2009 Haiku\n" 274 274 "\n" 275 275 "\tIthamar R. Adema\n" … … 280 280 void 281 281 ConfigWindow::AboutRequested() 282 282 { 283 BAlert *about = new BAlert("About Printer Server", kAbout, "OK");283 BAlert *about = new BAlert("About printer server", kAbout, "OK"); 284 284 about->Go(); 285 285 } 286 286 -
src/servers/registrar/ShutdownProcess.cpp
224 224 class ShutdownProcess::ShutdownWindow : public BWindow { 225 225 public: 226 226 ShutdownWindow() 227 : BWindow(BRect(0, 0, 200, 100), "Shutdown Status",227 : BWindow(BRect(0, 0, 200, 100), "Shutdown status", 228 228 B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, 229 229 B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_MINIMIZABLE 230 230 | B_NOT_ZOOMABLE | B_NOT_CLOSABLE, B_ALL_WORKSPACES), … … 272 272 273 273 // kill app button 274 274 fKillAppButton = new(nothrow) BButton(BRect(0, 0, 10, 10), "kill app", 275 "Kill Application", NULL, B_FOLLOW_NONE);275 "Kill application", NULL, B_FOLLOW_NONE); 276 276 if (!fKillAppButton) 277 277 return B_NO_MEMORY; 278 278 fRootView->AddChild(fKillAppButton); … … 287 287 288 288 // cancel shutdown button 289 289 fCancelShutdownButton = new(nothrow) BButton(BRect(0, 0, 10, 10), 290 "cancel shutdown", "Cancel Shutdown", NULL, B_FOLLOW_NONE);290 "cancel shutdown", "Cancel shutdown", NULL, B_FOLLOW_NONE); 291 291 if (!fCancelShutdownButton) 292 292 return B_NO_MEMORY; 293 293 fRootView->AddChild(fCancelShutdownButton); … … 300 300 301 301 // reboot system button 302 302 fRebootSystemButton = new(nothrow) BButton(BRect(0, 0, 10, 10), 303 "reboot", "Restart System", NULL, B_FOLLOW_NONE);303 "reboot", "Restart system", NULL, B_FOLLOW_NONE); 304 304 if (!fRebootSystemButton) 305 305 return B_NO_MEMORY; 306 306 fRebootSystemButton->Hide(); … … 479 479 fRebootSystemButton->MakeDefault(true); 480 480 fRebootSystemButton->Show(); 481 481 482 SetTitle("System is Shut Down");482 SetTitle("System is shut down"); 483 483 fTextView->SetText("It's now safe to turn off the computer."); 484 484 } 485 485 … … 492 492 // TODO: Temporary work-around for a Haiku bug. 493 493 fAbortedOKButton->Invalidate(); 494 494 495 SetTitle("Shutdown Aborted");495 SetTitle("Shutdown aborted"); 496 496 } 497 497 498 498 private: … … 1235 1235 // ask the user to confirm the shutdown, if desired 1236 1236 bool askUser; 1237 1237 if (fHasGUI && fRequest->FindBool("confirm", &askUser) == B_OK && askUser) { 1238 const char* title = fReboot ? "Restart?" : "Shut Down?";1238 const char* title = fReboot ? "Restart?" : "Shut down?"; 1239 1239 const char* text = fReboot 1240 1240 ? "Do you really want to restart the system?" 1241 1241 : "Do you really want to shut down the system?"; 1242 const char* defaultText = fReboot ? "Restart" : "Shut Down";1243 const char* otherText = fReboot ? "Shut Down" : "Restart";1242 const char* defaultText = fReboot ? "Restart" : "Shut down"; 1243 const char* otherText = fReboot ? "Shut down" : "Restart"; 1244 1244 BAlert* alert = new BAlert(title, text, "Cancel", otherText, defaultText, 1245 1245 B_WIDTH_AS_USUAL, B_WARNING_ALERT); 1246 1246 alert->SetShortcut(0, B_ESCAPE); -
src/servers/mount/AutoMounter.cpp
394 394 } 395 395 string << "This will prevent unintentional data loss because of " 396 396 "errors in Haiku."; 397 BAlert* alert = new BAlert("Mount Warning", string.String(),398 "Mount Read/Write", "Cancel", "Mount Read-only",397 BAlert* alert = new BAlert("Mount warning", string.String(), 398 "Mount read/write", "Cancel", "Mount read-only", 399 399 B_WIDTH_FROM_WIDEST, B_WARNING_ALERT); 400 400 alert->SetShortcut(1, B_ESCAPE); 401 401 int32 choice = alert->Go(); … … 548 548 if (status < B_OK) { 549 549 BString string; 550 550 string << "Error mounting volume. (" << strerror(status) << ")"; 551 (new BAlert("", string.String(), "O k"))->Go(NULL);551 (new BAlert("", string.String(), "OK"))->Go(NULL); 552 552 } 553 553 } 554 554 … … 560 560 text << "Could not unmount disk \"" << name << "\":\n\t"; 561 561 text << strerror(error); 562 562 text << "\n\nShould unmounting be forced?\n\n" 563 "Note: if an application is currently writing to the volume, "563 "Note: If an application is currently writing to the volume, " 564 564 "unmounting it now might result in loss of data.\n"; 565 565 566 BAlert* alert = new BAlert("", text.String(), "Cancel", "Force Unmount",566 BAlert* alert = new BAlert("", text.String(), "Cancel", "Force unmount", 567 567 NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); 568 568 alert->SetShortcut(0, B_ESCAPE); 569 569 int32 choice = alert->Go(); -
src/servers/syslog_daemon/SyslogDaemon.cpp
1 1 /* 2 * Copyright 2003-200 6, Axel Dörfler, axeld@pinc-software.de. All rights reserved.2 * Copyright 2003-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved. 3 3 * Distributed under the terms of the MIT License. 4 4 */ 5 5 … … 58 58 "all system messages and write them to the " 59 59 "system-wide log at \"%s\".\n\n", path.Path()); 60 60 61 BAlert *alert = new BAlert("Syslog Daemon", message, "Ok");61 BAlert *alert = new BAlert("Syslog daemon", message, "OK"); 62 62 BTextView *view = alert->TextView(); 63 63 BFont font; 64 64 -
src/servers/bluetooth/DeskbarReplicant.cpp
177 177 178 178 BPopUpMenu* menu = new BPopUpMenu(B_EMPTY_STRING, false, false); 179 179 180 menu->AddItem(new BMenuItem(" OpenPreferences"B_UTF8_ELLIPSIS,180 menu->AddItem(new BMenuItem("Preferences"B_UTF8_ELLIPSIS, 181 181 new BMessage(kMsgOpenBluetoothPreferences))); 182 182 183 183 // TODO show list of known/paired devices … … 187 187 */ 188 188 menu->AddSeparatorItem(); 189 189 190 menu->AddItem(new BMenuItem("Show Server Console" B_UTF8_ELLIPSIS,190 menu->AddItem(new BMenuItem("Show server console" B_UTF8_ELLIPSIS, 191 191 new BMessage(kMsgShowBluetoothServerConsole))); 192 192 193 menu->AddItem(new BMenuItem("Stop Server",193 menu->AddItem(new BMenuItem("Stop server", 194 194 new BMessage(kMsgQuitBluetoothServer))); 195 195 196 196 menu->SetTargetForItems(this); … … 218 218 status_t status = BMessenger(BLUETOOTH_SIGNATURE).SendMessage( 219 219 BT_MSG_SERVER_SHOW_CONSOLE); 220 220 if (status < B_OK) { 221 _ShowErrorAlert("Showing the Bluetooth Server Console failed.", status);221 _ShowErrorAlert("Showing the Bluetooth server console failed.", status); 222 222 } 223 223 } 224 224 … … 232 232 status_t status = BMessenger(BLUETOOTH_SIGNATURE).SendMessage( 233 233 B_QUIT_REQUESTED); 234 234 if (status < B_OK) { 235 _ShowErrorAlert("Stopping the Bluetooth Server failed.", status);235 _ShowErrorAlert("Stopping the Bluetooth server failed.", status); 236 236 } 237 237 } 238 238 … … 241 241 DeskbarReplicant::_ShowErrorAlert(BString msg, status_t status) 242 242 { 243 243 msg << "\n\nError: " << strerror(status); 244 BAlert* alert = new BAlert("Bluetooth Error", msg.String(), "Ok");244 BAlert* alert = new BAlert("Bluetooth error", msg.String(), "OK"); 245 245 alert->Go(NULL); 246 246 } 247 247 -
src/kits/media/TimeSourceObject.cpp
41 41 ASSERT(fKinds == node.kind); 42 42 43 43 if (node.node == NODE_SYSTEM_TIMESOURCE_ID) { 44 strcpy(fName, "System Clock");44 strcpy(fName, "System clock"); 45 45 fIsRealtime = true; 46 46 } else { 47 47 live_node_info liveNodeInfo; -
src/kits/media/DefaultMediaTheme.cpp
774 774 775 775 776 776 DefaultMediaTheme::DefaultMediaTheme() 777 : BMediaTheme("Haiku Theme", "Haiku built-in theme version 0.1")777 : BMediaTheme("Haiku theme", "Haiku built-in theme version 0.1") 778 778 { 779 779 CALLED(); 780 780 } -
src/kits/mail/StatusWindow.cpp
48 48 frame.InsetBy(90.0 + 5.0, 5.0); 49 49 50 50 fCheckNowButton = new BButton(frame, "check_mail", 51 MDR_DIALECT_CHOICE ("Check Mail Now","メールチェック"),51 MDR_DIALECT_CHOICE ("Check mail now","メールチェック"), 52 52 new BMessage('mbth'), B_FOLLOW_LEFT_RIGHT, 53 53 B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE); 54 54 fCheckNowButton->ResizeToPreferred(); -
src/kits/mail/ChainRunner.cpp
1 1 /* BMailChainRunner - runs the mail inbound and outbound chains 2 2 ** 3 3 ** Copyright 2001-2003 Dr. Zoidberg Enterprises. All rights reserved. 4 ** Copyright 2009, Haiku, Inc. All rights reserved. 4 5 */ 5 6 6 7 … … 51 52 52 53 if (window == NULL) { 53 54 window = new ErrorLogWindow(BRect(200, 200, 500, 250), 54 "Mail Daemon Status Log", B_TITLED_WINDOW);55 "Mail daemon status log", B_TITLED_WINDOW); 55 56 } 56 57 57 58 lock.Unlock(); -
src/kits/mail/ProtocolConfigView.cpp
1 1 /* BMailProtocolConfigView - the standard config view for all protocols 2 2 ** 3 3 ** Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. 4 ** Copyright 2009, Haiku, Inc. All rights reserved. 4 5 */ 5 6 6 7 … … 116 117 rect.bottom = rect.top - 2 + sItemHeight; 117 118 118 119 if (options_mask & B_MAIL_PROTOCOL_HAS_HOSTNAME) 119 AddChild(AddTextField(rect,"host",MDR_DIALECT_CHOICE ("Mail Server:","サーバ名 :")));120 AddChild(AddTextField(rect,"host",MDR_DIALECT_CHOICE ("Mail server:","サーバ名 :"))); 120 121 121 122 if (options_mask & B_MAIL_PROTOCOL_HAS_USERNAME) 122 123 AddChild(AddTextField(rect,"user",MDR_DIALECT_CHOICE ("Username:","ユーザーID:"))); … … 128 129 } 129 130 130 131 if (options_mask & B_MAIL_PROTOCOL_HAS_FLAVORS) 131 AddChild(AddMenuField(rect,"flavor","Connection Type:"));132 AddChild(AddMenuField(rect,"flavor","Connection type:")); 132 133 133 134 if (options_mask & B_MAIL_PROTOCOL_HAS_AUTH_METHODS) 134 AddChild(AddMenuField(rect,"auth_method",MDR_DIALECT_CHOICE ("Login Type:","認証方法 :")));135 AddChild(AddMenuField(rect,"auth_method",MDR_DIALECT_CHOICE ("Login type:","認証方法 :"))); 135 136 136 137 // set divider 137 138 float width = FindWidestLabel(this); -
src/kits/print/JobSetupPanel.cpp
1 1 /* 2 * Copyright 2008 HaikuInc. All rights reserved.2 * Copyright 2008-2009 Haiku, Inc. All rights reserved. 3 3 * Distributed under the terms of the MIT License. 4 4 * 5 5 * Authors: … … 32 32 33 33 34 34 BJobSetupPanel::BJobSetupPanel(BPrinter* printer) 35 : BPrintPanel("Print Document")35 : BPrintPanel("Print document") 36 36 , fPrinter(printer) 37 37 , fPrinterRoster(NULL) 38 38 , fPrintRange(B_ALL_PAGES) … … 44 44 45 45 46 46 BJobSetupPanel::BJobSetupPanel(BPrinter* printer, uint32 flags) 47 : BPrintPanel("Print Document")47 : BPrintPanel("Print document") 48 48 , fPrinter(printer) 49 49 , fPrinterRoster(NULL) 50 50 , fPrintRange(B_ALL_PAGES) … … 314 314 315 315 box = new BBox(B_FANCY_BORDER, view); 316 316 box->SetLabel(BGroupLayoutBuilder() 317 .Add(new BStringView("", "Page Range"))317 .Add(new BStringView("", "Page range")) 318 318 .SetInsets(2.0, 0.0, 2.0, 0.0)); 319 319 320 320 // copies -
src/kits/interface/Dragger.cpp
727 727 728 728 fPopUp->AddItem(new BMenuItem(about, msg)); 729 729 fPopUp->AddSeparatorItem(); 730 fPopUp->AddItem(new BMenuItem("Remove Replicant",730 fPopUp->AddItem(new BMenuItem("Remove replicant", 731 731 new BMessage(kDeleteReplicant))); 732 732 } 733 733 -
src/kits/storage/disk_device/PartitioningDialog.cpp
22 22 23 23 // constructor 24 24 PartitioningDialog::PartitioningDialog(BRect dialogCenter) 25 : BWindow(BRect(100, 100, 100, 100), "Partitioning Parameters",25 : BWindow(BRect(100, 100, 100, 100), "Partitioning parameters", 26 26 B_TITLED_WINDOW, 27 27 B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE), 28 28 fEditor(NULL), -
src/kits/bluetooth/DeviceClass.cpp
1 1 /* 2 * Copyright 2007-200 8Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com2 * Copyright 2007-2009 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com 3 3 * All rights reserved. Distributed under the terms of the MIT License. 4 4 */ 5 5 … … 11 11 DeviceClass::GetServiceClass(BString& serviceClass) 12 12 { 13 13 static const char *services[] = { "Positioning", "Networking", 14 "Rendering", "Capturing", "Object Transfer",14 "Rendering", "Capturing", "Object transfer", 15 15 "Audio", "Telephony", "Information" }; 16 16 17 17 if (ServiceClass() != 0) { … … 39 39 DeviceClass::GetMajorDeviceClass(BString& majorClass) 40 40 { 41 41 static const char *major_devices[] = { "Miscellaneous", "Computer", "Phone", 42 "LAN Access", "Audio/Video", "Peripheral", "Imaging", "Uncategorized" };42 "LAN access", "Audio/Video", "Peripheral", "Imaging", "Uncategorized" }; 43 43 44 44 if (MajorDeviceClass() >= sizeof(major_devices) / sizeof(*major_devices)) 45 majorClass << "Invalid Device Class!\n";45 majorClass << "Invalid device class!\n"; 46 46 else 47 47 majorClass << major_devices[MajorDeviceClass()]; 48 48 … … 102 102 minorClass << "Wired modem or voice gateway"; 103 103 break; 104 104 case 5: 105 minorClass << "Common ISDN Access";105 minorClass << "Common ISDN access"; 106 106 break; 107 107 case 6: 108 minorClass << "S im Card Reader";108 minorClass << "SIM card reader"; 109 109 break; 110 110 } 111 111 break; … … 147 147 minorClass << "Uncategorized"; 148 148 break; 149 149 case 1: 150 minorClass << "Device conforms to the Headset profile";150 minorClass << "Device conforms to the headset profile"; 151 151 break; 152 152 case 2: 153 153 minorClass << "Hands-free"; … … 163 163 minorClass << "Headphones"; 164 164 break; 165 165 case 7: 166 minorClass << "Portable Audio";166 minorClass << "Portable audio"; 167 167 break; 168 168 case 8: 169 minorClass << "Car Audio";169 minorClass << "Car audio"; 170 170 break; 171 171 case 9: 172 172 minorClass << "Set-top box"; 173 173 break; 174 174 case 10: 175 minorClass << "HiFi Audio Device";175 minorClass << "HiFi audio device"; 176 176 break; 177 177 case 11: 178 178 minorClass << "VCR"; 179 179 break; 180 180 case 12: 181 minorClass << "Video Camera";181 minorClass << "Video camera"; 182 182 break; 183 183 case 13: 184 184 minorClass << "Camcorder"; 185 185 break; 186 186 case 14: 187 minorClass << "Video Monitor";187 minorClass << "Video monitor"; 188 188 break; 189 189 case 15: 190 minorClass << "Video Display and Loudspeaker";190 minorClass << "Video display and loudspeaker"; 191 191 break; 192 192 case 16: 193 minorClass << "Video Conferencing";193 minorClass << "Video conferencing"; 194 194 break; 195 195 /* 17 is reserved */ 196 196 case 18: … … 258 258 case 7: /* wearable */ 259 259 switch(minor) { 260 260 case 1: 261 minorClass << "Wrist Watch";261 minorClass << "Wrist watch"; 262 262 break; 263 263 case 2: 264 264 minorClass << "Pager"; … … 283 283 minorClass << "Vehicle"; 284 284 break; 285 285 case 3: 286 minorClass << "Doll / Action Figure";286 minorClass << "Doll/Action figure"; 287 287 break; 288 288 case 4: 289 289 minorClass << "Controller"; … … 306 306 void 307 307 DeviceClass::DumpDeviceClass(BString& string) 308 308 { 309 string << "Service Classes: ";309 string << "Service classes: "; 310 310 GetServiceClass(string); 311 311 string << " | "; 312 string << "Major Class: ";312 string << "Major class: "; 313 313 GetMajorDeviceClass(string); 314 314 string << " | "; 315 string << "Minor Class: ";315 string << "Minor class: "; 316 316 GetMinorDeviceClass(string); 317 317 string << "."; 318 318 } -
src/kits/bluetooth/CommandManager.cpp
1 1 /* 2 * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com2 * Copyright 2008-2009 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com 3 3 * Copyright 2008 Mika Lindqvist 4 4 * All rights reserved. Distributed under the terms of the MIT License. 5 5 */ … … 341 341 342 342 const char* linkControlCommands[] = { 343 343 "Inquiry", 344 "Inquiry Cancel",345 "Periodic Inquiry Mode",346 "Exit Periodic Inquiry Mode",347 "Create Connection",344 "Inquiry cancel", 345 "Periodic inquiry mode", 346 "Exit periodic inquiry mode", 347 "Create connection", 348 348 "Disconnect", 349 "Add SCO Connection", // not on 2.1350 "Cancel Create Connection",351 "Accept Connection Request",352 "Reject Connection Request",353 "Link Key Request Reply",354 "Link Key Request Negative Reply",355 "PIN Code Request Reply",356 "PIN Code Request Negative Reply",357 "Change Connection Packet Type",349 "Add SCO connection", // not on 2.1 350 "Cancel create connection", 351 "Accept connection request", 352 "Reject connection request", 353 "Link key request reply", 354 "Link key request negative reply", 355 "PIN code request reply", 356 "PIN code request negative reply", 357 "Change connection packet type", 358 358 "Reserved", // not on 2.1", 359 "Authentication Requested",359 "Authentication requested", 360 360 "Reserved", // not on 2.1", 361 "Set Connection Encryption",361 "Set connection encryption", 362 362 "Reserved", // not on 2.1", 363 "Change Connection Link Key",363 "Change connection link key", 364 364 "Reserved", // not on 2.1", 365 "Master Link Key",365 "Master link key", 366 366 "Reserved", // not on 2.1", 367 "Remote Name Request",368 "Cancel Remote Name Request",369 "Read Remote Supported Features",370 "Read Remote Extended Features",371 "Read Remote Version Information",367 "Remote name request", 368 "Cancel remote name request", 369 "Read remote supported features", 370 "Read remote extended features", 371 "Read remote version information", 372 372 "Reserved", // not on 2.1", 373 "Read Clock Offset",374 "Read LMP Handle",373 "Read clock offset", 374 "Read LMP handle", 375 375 "Reserved", 376 376 "Reserved", 377 377 "Reserved", … … 379 379 "Reserved", 380 380 "Reserved", 381 381 "Reserved", 382 "Setup Synchronous Connection",383 "Accept Synchronous Connection",384 "Reject Synchronous Connection",385 "IO Capability Request Reply",386 "User Confirmation Request Reply",387 "User Confirmation Request Negative Reply",388 "User Passkey Request Reply",389 "User Passkey Request Negative Reply",390 "Remote OOB Data Request Reply",382 "Setup synchronous connection", 383 "Accept synchronous connection", 384 "Reject synchronous connection", 385 "IO capability request reply", 386 "User confirmation request reply", 387 "User confirmation request negative reply", 388 "User passkey request reply", 389 "User passkey request negative reply", 390 "Remote OOB data request reply", 391 391 "Reserved", 392 392 "Reserved", 393 "Remote OOB Data Request Negative Reply",394 "IO Capabilities Response Negative Reply"393 "Remote OOB data request negative reply", 394 "IO capabilities response negative reply" 395 395 }; 396 396 397 397 398 398 const char* linkPolicyCommands[] = { 399 "Hold Mode",399 "Hold mode", 400 400 "Reserved", 401 "Sniff Mode",402 "Exit Sniff Mode",403 "Park State",404 "Exit Park State",405 "QoS Setup",401 "Sniff mode", 402 "Exit sniff mode", 403 "Park state", 404 "Exit park state", 405 "QoS setup", 406 406 "Reserved", 407 "Role Discovery",407 "Role discovery", 408 408 "Reserved", 409 "Switch Role",410 "Read Link Policy Settings",411 "Write Link Policy Settings",412 "Read Default Link Policy Settings",413 "Write Default Link Policy Settings",414 "Flow Specification",415 "Sniff Subrating"409 "Switch role", 410 "Read link policy settings", 411 "Write link policy settings", 412 "Read default link policy settings", 413 "Write default link policy settings", 414 "Flow specification", 415 "Sniff subrating" 416 416 }; 417 417 418 418 419 419 const char* controllerBasebandCommands[] = { 420 "Set Event Mask",420 "Set event mask", 421 421 "Reserved", 422 422 "Reset", 423 423 "Reserved", 424 "Set Event Filter",424 "Set event filter", 425 425 "Reserved", 426 426 "Reserved", 427 427 "Flush", 428 "Read PIN Type",429 "Write PIN Type",430 "Create New Unit Key",428 "Read PIN type", 429 "Write PIN type", 430 "Create new unit key", 431 431 "Reserved", 432 "Read Stored Link Key",432 "Read stored link key", 433 433 "Reserved", 434 434 "Reserved", 435 435 "Reserved", 436 "Write Stored Link Key",437 "Delete Stored Link Key",438 "Write Local Name",439 "Read Local Name",440 "Read Connection Accept Timeout",441 "Write Connection Accept Timeout",442 "Read Page Timeout",443 "Write Page Timeout",444 "Read Scan Enable",445 "Write Scan Enable",446 "Read Page Scan Activity",447 "Write Page Scan Activity",448 "Read Inquiry Scan Activity",449 "Write Inquiry Scan Activity",450 "Read Authentication Enable",451 "Write Authentication Enable",452 "Read Encryption Mode", // not 2.1453 "Write Encryption Mode",// not 2.1454 "Read Class Of Device",455 "Write Class Of Device",456 "Read Voice Setting",457 "Write Voice Setting",458 "Read Automatic Flush Timeout",459 "Write Automatic Flush Timeout",460 "Read Num Broadcast Retransmissions",461 "Write Num Broadcast Retransmissions",462 "Read Hold Mode Activity",463 "Write Hold Mode Activity",464 "Read Transmit Power Level",465 "Read Synchronous Flow Control Enable",466 "Write Synchronous Flow Control Enable",436 "Write stored link key", 437 "Delete stored link key", 438 "Write local name", 439 "Read local name", 440 "Read connection accept timeout", 441 "Write connection accept timeout", 442 "Read page timeout", 443 "Write page timeout", 444 "Read scan enable", 445 "Write scan enable", 446 "Read page scan activity", 447 "Write page scan activity", 448 "Read inquiry scan activity", 449 "Write inquiry scan activity", 450 "Read authentication enable", 451 "Write authentication enable", 452 "Read encryption mode", // not 2.1 453 "Write encryption mode",// not 2.1 454 "Read class of device", 455 "Write class of device", 456 "Read voice setting", 457 "Write voice setting", 458 "Read automatic flush timeout", 459 "Write automatic flush timeout", 460 "Read num broadcast retransmissions", 461 "Write num broadcast retransmissions", 462 "Read hold mode activity", 463 "Write hold mode activity", 464 "Read transmit power level", 465 "Read synchronous flow control enable", 466 "Write synchronous flow control enable", 467 467 "Reserved", 468 "Set Host Controller To Host Flow Control",468 "Set host controller to host flow control", 469 469 "Reserved", 470 "Host Buffer Size",470 "Host buffer size", 471 471 "Reserved", 472 "Host Number Of Completed Packets",473 "Read Link Supervision Timeout",474 "Write Link Supervision Timeout",475 "Read Number of Supported IAC",476 "Read Current IAC LAP",477 "Write Current IAC LAP",478 "Read Page Scan Period Mode", // not 2.1479 "Write Page Scan Period Mode", // not 2.1480 "Read Page Scan Mode", // not 2.1481 "Write Page Scan Mode", // not 2.1482 "Set AFH Channel Classification",472 "Host number of completed packets", 473 "Read link supervision timeout", 474 "Write link supervision timeout", 475 "Read number of supported IAC", 476 "Read current IAC LAP", 477 "Write current IAC LAP", 478 "Read page scan period mode", // not 2.1 479 "Write page scan period mode", // not 2.1 480 "Read page scan mode", // not 2.1 481 "Write page scan mode", // not 2.1 482 "Set AFH channel classification", 483 483 "Reserved", 484 484 "Reserved", 485 "Read Inquiry Scan Type",486 "Write Inquiry Scan Type",487 "Read Inquiry Mode",488 "Write Inquiry Mode",489 "Read Page Scan Type",490 "Write Page Scan Type",491 "Read AFH Channel Assessment Mode",492 "Write AFH Channel Assessment Mode",485 "Read inquiry scan type", 486 "Write inquiry scan type", 487 "Read inquiry mode", 488 "Write inquiry mode", 489 "Read page scan type", 490 "Write page scan type", 491 "Read AFH channel assessment mode", 492 "Write AFH channel assessment mode", 493 493 "Reserved", 494 494 "Reserved", 495 495 "Reserved", … … 497 497 "Reserved", 498 498 "Reserved", 499 499 "Reserved", 500 "Read Extended Inquiry Response",501 "Write Extended Inquiry Response",502 "Refresh Encryption Key",500 "Read extended inquiry response", 501 "Write extended inquiry response", 502 "Refresh encryption key", 503 503 "Reserved", 504 "Read Simple Pairing Mode",505 "Write Simple Pairing Mode",506 "Read Local OOB Data",507 "Read Inquiry Transmit Power Level",508 "Write Inquiry Transmit Power Level",509 "Read Default Erroneous Data Reporting",510 "Write Default Erroneous Data Reporting",504 "Read simple pairing mode", 505 "Write simple pairing mode", 506 "Read local OOB data", 507 "Read inquiry transmit power level", 508 "Write inquiry transmit power level", 509 "Read default erroneous data reporting", 510 "Write default erroneous data reporting", 511 511 "Reserved", 512 512 "Reserved", 513 513 "Reserved", 514 "Enhanced Flush",515 "Send Keypress Notification"514 "Enhanced flush", 515 "Send keypress notification" 516 516 }; 517 517 518 518 519 519 const char* informationalParametersCommands[] = { 520 "Read Local Version Information",521 "Read Local Supported Commands",522 "Read Local Supported Features",523 "Read Local Extended Features",524 "Read Buffer Size",520 "Read local version information", 521 "Read local supported commands", 522 "Read local supported features", 523 "Read local extended features", 524 "Read buffer size", 525 525 "Reserved", 526 "Read Country Code", // not 2.1526 "Read country code", // not 2.1 527 527 "Reserved", 528 528 "Read BD ADDR" 529 529 }; 530 530 531 531 532 532 const char* statusParametersCommands[] = { 533 "Read Failed Contact Counter",534 "Reset Failed Contact Counter",535 "Read Link Quality",533 "Read failed contact counter", 534 "Reset failed contact counter", 535 "Read link quality", 536 536 "Reserved", 537 537 "Read RSSI", 538 "Read AFH Channel Map",539 "Read Clock",538 "Read AFH channel map", 539 "Read clock", 540 540 }; 541 541 542 542 543 543 const char* testingCommands[] = { 544 "Read Loopback Mode",545 "Write Loopback Mode",546 "Enable Device Under Test Mode",547 "Write Simple Pairing Debug Mode",544 "Read loopback mode", 545 "Write loopback mode", 546 "Enable device under test mode", 547 "Write simple pairing debug mode", 548 548 }; 549 549 550 550 551 551 const char* bluetoothEvents[] = { 552 "Inquiry Complete",553 "Inquiry Result",554 "Conn Complete",555 "Conn Request",556 "Disconnection Complete",557 "Auth Complete",558 "Remote Name Request Complete",559 "Encrypt Change",560 "Change Conn Link Key Complete",561 "Master Link Key Compl",562 "Rmt Features",563 "Rmt Version",564 "Qo s Setup Complete",565 "Command Complete",566 "Command Status",567 "Hardware Error",568 "Flush Occur",569 "Role Change",570 "Num Comp Pkts",571 "Mode Change",572 "Return Link Keys",573 "Pin Code Req",574 "Link Key Req",575 "Link Key Notify",576 "Loopback Command",577 "Data Buffer Overflow",578 "Max Slot Change",579 "Read Clock Offset Compl",580 "Con Pkt Type Changed",581 "Qo s Violation",552 "Inquiry complete", 553 "Inquiry result", 554 "Conn complete", 555 "Conn request", 556 "Disconnection complete", 557 "Auth complete", 558 "Remote name request complete", 559 "Encrypt change", 560 "Change conn link key complete", 561 "Master link key compl", 562 "Rmt features", 563 "Rmt version", 564 "QoS setup complete", 565 "Command complete", 566 "Command status", 567 "Hardware error", 568 "Flush occur", 569 "Role change", 570 "Num comp Pkts", 571 "Mode change", 572 "Return link keys", 573 "Pin code req", 574 "Link key req", 575 "Link key notify", 576 "Loopback command", 577 "Data buffer overflow", 578 "Max slot change", 579 "Read clock offset compl", 580 "Con Pkt type changed", 581 "QoS violation", 582 582 "Reserved", 583 "Page Scan Rep Mode Change",584 "Flow Specification",585 "Inquiry Result With Rssi",586 "Remote Extended Features",583 "Page scan Rep mode change", 584 "Flow specification", 585 "Inquiry result with RSSI", 586 "Remote extended features", 587 587 "Reserved", 588 588 "Reserved", 589 589 "Reserved", … … 592 592 "Reserved", 593 593 "Reserved", 594 594 "Reserved", 595 "Synchronous Connection Completed",596 "Synchronous Connection Changed",595 "Synchronous connection completed", 596 "Synchronous connection changed", 597 597 "Reserved", 598 "Extended Inquiry Result",599 "Encryption Key Refresh Complete",600 "I o Capability Request",601 "I o Capability Response",602 "User Confirmation Request",603 "User Passkey Request",604 "O ob Data Request",605 "Simple Pairing Complete",598 "Extended inquiry result", 599 "Encryption key refresh complete", 600 "IO capability request", 601 "IO capability response", 602 "User confirmation request", 603 "User passkey request", 604 "OOB data request", 605 "Simple pairing complete", 606 606 "Reserved", 607 "Link Supervision Timeout Changed",608 "Enhanced Flush Complete",607 "Link supervision timeout changed", 608 "Enhanced flush complete", 609 609 "Reserved", 610 610 "Reserved", 611 "Keypress Notification",612 "Remote Host Supported Features Notification"611 "Keypress notification", 612 "Remote host supported features notification" 613 613 }; 614 614 615 615 616 616 const char* bluetoothErrors[] = { 617 "No Error",618 "Unknown Command",619 "No Connection",620 "Hardware Failure",621 "Page Timeout",622 "Authentication Failure",623 "Pin Or Key Missing",624 "Memory Full",625 "Connection Timeout",626 "Max Number Of Connections",627 "Max Number Of Sco Connections",628 "Acl Connection Exists",629 "Command Disallowed",630 "Rejected Limited Resources",631 "Rejected Security",632 "Rejected Personal",633 "Host Timeout",634 "Unsupported Feature",635 "Invalid Parameters",636 "Remote User Ended Connection",637 "Remote Low Resources",638 "Remote Power Off",639 "Connection Terminated",640 "Repeated Attempts",641 "Pairing Not Allowed",642 "Unknown L mpPdu",643 "Unsupported Remote Feature",644 "S co Offset Rejected",645 "S co Interval Rejected",646 "Air Mode Rejected",647 "Invalid L mp Parameters",648 "Unspecified Error",649 "Unsupported L mp Parameter Value",650 "Role Change Not Allowed",651 "L mp Response Timeout",652 "L mp Error Transaction Collision",653 "L mp Pdu Not Allowed",654 "Encryption Mode Not Accepted",655 "Unit Link Key Used",656 "Qo s Not Supported",657 "Instant Passed",658 "Pairing With Unit Key Not Supported",659 "Different Transaction Collision",660 "Qo s Unacceptable Parameter",661 "Qo s Rejected",662 "Classification Not Supported",663 "Insufficient Security",664 "Parameter Out Of Range",617 "No error", 618 "Unknown command", 619 "No connection", 620 "Hardware failure", 621 "Page timeout", 622 "Authentication failure", 623 "Pin or key missing", 624 "Memory full", 625 "Connection timeout", 626 "Max number of connections", 627 "Max number of SCO connections", 628 "Acl connection exists", 629 "Command disallowed", 630 "Rejected limited resources", 631 "Rejected security", 632 "Rejected personal", 633 "Host timeout", 634 "Unsupported feature", 635 "Invalid parameters", 636 "Remote user ended connection", 637 "Remote low resources", 638 "Remote power off", 639 "Connection terminated", 640 "Repeated attempts", 641 "Pairing not allowed", 642 "Unknown LMP Pdu", 643 "Unsupported remote feature", 644 "SCO offset rejected", 645 "SCO interval rejected", 646 "Air mode rejected", 647 "Invalid LMP parameters", 648 "Unspecified error", 649 "Unsupported LMP parameter value", 650 "Role change not allowed", 651 "LMP response timeout", 652 "LMP error transaction collision", 653 "LMP Pdu not allowed", 654 "Encryption mode not accepted", 655 "Unit link key used", 656 "QoS not supported", 657 "Instant passed", 658 "Pairing with unit key not supported", 659 "Different transaction collision", 660 "QoS unacceptable parameter", 661 "QoS rejected", 662 "Classification not supported", 663 "Insufficient security", 664 "Parameter out of range", 665 665 "Reserved", 666 "Role Switch Pending",666 "Role switch pending", 667 667 "Reserved", 668 "Slot Violation",669 "Role Switch Failed",670 "Extended Inquiry Response Too Large",671 "Simple Pairing Not Supported By Host",672 "Host Busy Pairing"668 "Slot violation", 669 "Role switch failed", 670 "Extended inquiry response too Large", 671 "Simple pairing not supported by host", 672 "Host busy pairing" 673 673 }; 674 674 675 675 … … 741 741 if (event < sizeof(bluetoothEvents) / sizeof(const char*)) { 742 742 return bluetoothEvents[event-1]; 743 743 } else { 744 return "Event out of Range!";744 return "Event out of range!"; 745 745 } 746 746 } 747 747 -
src/kits/bluetooth/UI/ConnectionIncoming.cpp
1 1 /* 2 * Copyright 2007-200 8Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com2 * Copyright 2007-2009 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com 3 3 * 4 4 * All rights reserved. Distributed under the terms of the MIT License. 5 5 * … … 58 58 59 59 //--------------------------------------------------------------- 60 60 ConnectionIncoming::ConnectionIncoming(RemoteDevice* rDevice) 61 : BWindow(BRect(700, 100, 900, 150), "Connection Completed",61 : BWindow(BRect(700, 100, 900, 150), "Connection completed", 62 62 B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, 63 63 B_NOT_ZOOMABLE | B_NOT_RESIZABLE) 64 64 { -
src/kits/bluetooth/UI/PincodeWindow.cpp
1 1 /* 2 * Copyright 2007-200 8Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com2 * Copyright 2007-2009 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com 3 3 * All rights reserved. Distributed under the terms of the MIT License. 4 4 */ 5 5 … … 47 47 #endif 48 48 49 49 PincodeWindow::PincodeWindow(bdaddr_t address, hci_id hid) 50 : BWindow(BRect(800, 200, 900, 300), "Pincode Request",50 : BWindow(BRect(800, 200, 900, 300), "Pincode request", 51 51 B_FLOATING_WINDOW, 52 52 B_WILL_ACCEPT_FIRST_CLICK | B_NOT_RESIZABLE| B_NOT_ZOOMABLE 53 53 | B_AUTO_UPDATE_SIZE_LIMITS, … … 62 62 63 63 64 64 PincodeWindow::PincodeWindow(RemoteDevice* rDevice) 65 : BWindow(BRect(800, 200, 900, 300), "Pincode Request",65 : BWindow(BRect(800, 200, 900, 300), "Pincode request", 66 66 B_FLOATING_WINDOW, 67 67 B_WILL_ACCEPT_FIRST_CLICK | B_NOT_ZOOMABLE | B_NOT_RESIZABLE 68 68 | B_AUTO_UPDATE_SIZE_LIMITS,