OLD | NEW |
1 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 1 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> |
7 <link rel="import" href="../i18n_setup.html"> | 7 <link rel="import" href="../i18n_setup.html"> |
8 <link rel="import" href="cups_add_printer_dialog_util.html"> | 8 <link rel="import" href="cups_add_printer_dialog_util.html"> |
9 <link rel="import" href="cups_printers_browser_proxy.html"> | 9 <link rel="import" href="cups_printers_browser_proxy.html"> |
10 <link rel="import" href="../settings_shared_css.html"> | 10 <link rel="import" href="../settings_shared_css.html"> |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 $i18n{manuallyAddPrinterButtonText} | 68 $i18n{manuallyAddPrinterButtonText} |
69 </paper-button> | 69 </paper-button> |
70 </div> | 70 </div> |
71 <div> <!-- Right group --> | 71 <div> <!-- Right group --> |
72 <paper-button class="cancel-button secondary-button" | 72 <paper-button class="cancel-button secondary-button" |
73 on-tap="onCancelTap_"> | 73 on-tap="onCancelTap_"> |
74 $i18n{cancelButtonText} | 74 $i18n{cancelButtonText} |
75 </paper-button> | 75 </paper-button> |
76 <paper-button class="action-button" id="addPrinterButton" | 76 <paper-button class="action-button" id="addPrinterButton" |
77 disabled="[[!selectedPrinter]]" | 77 disabled="[[!selectedPrinter]]" |
78 on-tap="switchToConfiguringDialog_"> | 78 on-tap="switchToManufacturerDialog_"> |
79 $i18n{addPrinterButtonText} | 79 $i18n{addPrinterButtonText} |
80 </paper-button> | 80 </paper-button> |
81 </div> | 81 </div> |
82 </div> | 82 </div> |
83 </add-printer-dialog> | 83 </add-printer-dialog> |
84 </template> | 84 </template> |
85 </dom-module> | 85 </dom-module> |
86 | 86 |
87 <dom-module id="add-printer-manually-dialog"> | 87 <dom-module id="add-printer-manually-dialog"> |
88 <template> | 88 <template> |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 </div> | 309 </div> |
310 </div> | 310 </div> |
311 </div> | 311 </div> |
312 <div class="error-message" hidden="[[!setupFailed]]"> | 312 <div class="error-message" hidden="[[!setupFailed]]"> |
313 Driver not found (exact error message TBD) | 313 Driver not found (exact error message TBD) |
314 </div> | 314 </div> |
315 </div> | 315 </div> |
316 <div class="dialog-buttons"> | 316 <div class="dialog-buttons"> |
317 <div> <!-- Left group --> | 317 <div> <!-- Left group --> |
318 <paper-button id="manuallyAddPrinterButton" class="secondary-button" | 318 <paper-button id="manuallyAddPrinterButton" class="secondary-button" |
319 on-tap="switchToManualAddDialog_"> | 319 on-tap="switchToManualAddDialog_" hidden="[[!inManualFlow]]"> |
320 $i18n{manuallyAddPrinterButtonText} | 320 $i18n{back} |
321 </paper-button> | 321 </paper-button> |
322 </div> | 322 </div> |
323 <div> <!-- Right group --> | 323 <div> <!-- Right group --> |
324 <paper-button class="cancel-button secondary-button" | 324 <paper-button class="cancel-button secondary-button" |
325 on-tap="onCancelTap_"> | 325 on-tap="onCancelTap_"> |
326 $i18n{cancelButtonText} | 326 $i18n{cancelButtonText} |
327 </paper-button> | 327 </paper-button> |
328 <paper-button class="action-button" id="addPrinterButton" | 328 <paper-button class="action-button" id="addPrinterButton" |
329 on-tap="switchToConfiguringDialog_"> | 329 on-tap="switchToConfiguringDialog_"> |
330 $i18n{addPrinterButtonText} | 330 $i18n{addPrinterButtonText} |
(...skipping 27 matching lines...) Expand all Loading... |
358 </add-printer-dialog> | 358 </add-printer-dialog> |
359 </template> | 359 </template> |
360 </dom-module> | 360 </dom-module> |
361 | 361 |
362 <dom-module id="settings-cups-add-printer-dialog"> | 362 <dom-module id="settings-cups-add-printer-dialog"> |
363 <template> | 363 <template> |
364 <style include="settings-shared"></style> | 364 <style include="settings-shared"></style> |
365 | 365 |
366 <!-- Printer Discovery Dialog --> | 366 <!-- Printer Discovery Dialog --> |
367 <template is="dom-if" if="[[showDiscoveryDialog_]]" restamp> | 367 <template is="dom-if" if="[[showDiscoveryDialog_]]" restamp> |
368 <add-printer-discovery-dialog selected-printer="{{selectedPrinter}}"> | 368 <add-printer-discovery-dialog selected-printer="{{selectedPrinter}}" |
| 369 new-printer="{{newPrinter}}"> |
369 </add-printer-discovery-dialog> | 370 </add-printer-discovery-dialog> |
370 </template> | 371 </template> |
371 | 372 |
372 <!-- Manually Add Printer Dialog --> | 373 <!-- Manually Add Printer Dialog --> |
373 <template is="dom-if" if="[[showManuallyAddDialog_]]" restamp> | 374 <template is="dom-if" if="[[showManuallyAddDialog_]]" restamp> |
374 <add-printer-manually-dialog new-printer="{{newPrinter}}"> | 375 <add-printer-manually-dialog new-printer="{{newPrinter}}"> |
375 </add-printer-manually-dialog> | 376 </add-printer-manually-dialog> |
376 </template> | 377 </template> |
377 | 378 |
378 <!-- Configuring Printer Dialog --> | 379 <!-- Configuring Printer Dialog --> |
379 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> | 380 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> |
380 <add-printer-configuring-dialog | 381 <add-printer-configuring-dialog |
381 printer-name="[[getConfiguringPrinterName_()]]" | 382 printer-name="[[getConfiguringPrinterName_()]]" |
382 dialog-title="[[configuringDialogTitle]]"> | 383 dialog-title="[[configuringDialogTitle]]"> |
383 </add-printer-configuring-dialog> | 384 </add-printer-configuring-dialog> |
384 </template> | 385 </template> |
385 | 386 |
386 <!-- Manufacturer and Model Dialog --> | 387 <!-- Manufacturer and Model Dialog --> |
387 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> | 388 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> |
388 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" | 389 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" |
389 setup-failed="[[setupFailed]]"> | 390 setup-failed="[[setupFailed]]" in-manual-flow="[[inManualFlow]]"> |
390 </add-printer-manufacturer-model-dialog> | 391 </add-printer-manufacturer-model-dialog> |
391 </template> | 392 </template> |
392 | 393 |
393 </template> | 394 </template> |
394 <script src="cups_add_printer_dialog.js"></script> | 395 <script src="cups_add_printer_dialog.js"></script> |
395 </dom-module> | 396 </dom-module> |
OLD | NEW |