OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap
er-dropdown-menu-light.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap
er-dropdown-menu-light.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> | 4 <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-spinner/paper-spi
nner.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi
nner.html"> |
6 <link rel="import" href="/i18n_setup.html"> | 6 <link rel="import" href="/i18n_setup.html"> |
7 <link rel="import" href="/printing_page/cups_add_printer_dialog_util.html"> | 7 <link rel="import" href="/printing_page/cups_add_printer_dialog_util.html"> |
8 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html"> | 8 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html"> |
9 <link rel="import" href="/settings_shared_css.html"> | 9 <link rel="import" href="/settings_shared_css.html"> |
10 | 10 |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 </div> | 177 </div> |
178 </div> | 178 </div> |
179 <div class="dialog-buttons"> | 179 <div class="dialog-buttons"> |
180 <paper-button id="discoverPrintersButton" | 180 <paper-button id="discoverPrintersButton" |
181 on-tap="switchToDiscoveryDialog_"> | 181 on-tap="switchToDiscoveryDialog_"> |
182 $i18n{discoverPrintersButtonText} | 182 $i18n{discoverPrintersButtonText} |
183 </paper-button> | 183 </paper-button> |
184 <paper-button class="cancel-button" on-tap="onCancelTap_"> | 184 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
185 $i18n{cancelButtonText} | 185 $i18n{cancelButtonText} |
186 </paper-button> | 186 </paper-button> |
187 <paper-button class="action-button" on-tap="switchToManufacturerDialog_" | 187 <paper-button class="action-button" on-tap="switchToConfiguringDialog_" |
188 disabled="[[addPrinterNotAllowed_(newPrinter.printerName, | 188 disabled="[[!newPrinter.printerName]]"> |
189 newPrinter.printerAddress)]]"> | |
190 $i18n{addPrinterButtonText} | 189 $i18n{addPrinterButtonText} |
191 </paper-button> | 190 </paper-button> |
192 </div> | 191 </div> |
193 </add-printer-dialog> | 192 </add-printer-dialog> |
194 </template> | 193 </template> |
195 </dom-module> | 194 </dom-module> |
196 | 195 |
197 <dom-module id="add-printer-manufacturer-model-dialog"> | 196 <dom-module id="add-printer-manufacturer-model-dialog"> |
198 <template> | 197 <template> |
199 <style include="settings-shared"> | 198 <style include="settings-shared"> |
(...skipping 18 matching lines...) Expand all Loading... |
218 }; | 217 }; |
219 --paper-input-container-underline: { | 218 --paper-input-container-underline: { |
220 display: none; | 219 display: none; |
221 }; | 220 }; |
222 --paper-input-container-underline-focus: { | 221 --paper-input-container-underline-focus: { |
223 display: none; | 222 display: none; |
224 }; | 223 }; |
225 width: 340px; | 224 width: 340px; |
226 } | 225 } |
227 | 226 |
| 227 .error-message { |
| 228 background-color: var(--google-red-100); |
| 229 color: red; |
| 230 margin-top: 10px; |
| 231 padding: 10px 20px; |
| 232 } |
| 233 |
228 #manuallyAddPrinterButton { | 234 #manuallyAddPrinterButton { |
229 -webkit-margin-end: 210px; | 235 -webkit-margin-end: 210px; |
230 } | 236 } |
231 | 237 |
232 #browseButton { | 238 #browseButton { |
233 color: black; | 239 color: black; |
234 font-size: inherit; | 240 font-size: inherit; |
235 } | 241 } |
236 </style> | 242 </style> |
237 <add-printer-dialog> | 243 <add-printer-dialog> |
(...skipping 26 matching lines...) Expand all Loading... |
264 <div class="label">$i18n{selectDriver}</div> | 270 <div class="label">$i18n{selectDriver}</div> |
265 <div class="secondary"> | 271 <div class="secondary"> |
266 <paper-input no-label-float readonly> | 272 <paper-input no-label-float readonly> |
267 <paper-button suffix id="browseButton" on-tap="onBrowseFile_"> | 273 <paper-button suffix id="browseButton" on-tap="onBrowseFile_"> |
268 $i18n{selectDriverButtonText} | 274 $i18n{selectDriverButtonText} |
269 </paper-button> | 275 </paper-button> |
270 </paper-input> | 276 </paper-input> |
271 </div> | 277 </div> |
272 </div> | 278 </div> |
273 </div> | 279 </div> |
| 280 <div class="error-message" hidden="[[!setupFailed]]"> |
| 281 Driver not found (exact error message TBD) |
| 282 </div> |
274 </div> | 283 </div> |
275 <div class="dialog-buttons"> | 284 <div class="dialog-buttons"> |
276 <paper-button id="manuallyAddPrinterButton" | 285 <paper-button id="manuallyAddPrinterButton" |
277 on-tap="switchToManualAddDialog_"> | 286 on-tap="switchToManualAddDialog_"> |
278 $i18n{manuallyAddPrinterButtonText} | 287 $i18n{manuallyAddPrinterButtonText} |
279 </paper-button> | 288 </paper-button> |
280 <paper-button class="cancel-button" on-tap="onCancelTap_"> | 289 <paper-button class="cancel-button" on-tap="onCancelTap_"> |
281 $i18n{cancelButtonText} | 290 $i18n{cancelButtonText} |
282 </paper-button> | 291 </paper-button> |
283 <paper-button class="action-button" id="addPrinterButton" | 292 <paper-button class="action-button" id="addPrinterButton" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 | 338 |
330 <!-- Configuring Printer Dialog --> | 339 <!-- Configuring Printer Dialog --> |
331 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> | 340 <template is="dom-if" if="[[showConfiguringDialog_]]" restamp> |
332 <add-printer-configuring-dialog | 341 <add-printer-configuring-dialog |
333 printer-name="[[getConfiguringPrinterName_()]]"> | 342 printer-name="[[getConfiguringPrinterName_()]]"> |
334 </add-printer-configuring-dialog> | 343 </add-printer-configuring-dialog> |
335 </template> | 344 </template> |
336 | 345 |
337 <!-- Manufacturer and Model Dialog --> | 346 <!-- Manufacturer and Model Dialog --> |
338 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> | 347 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> |
339 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}"> | 348 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" |
| 349 setup-failed="[[setupFailed]]"> |
340 </add-printer-manufacturer-model-dialog> | 350 </add-printer-manufacturer-model-dialog> |
341 </template> | 351 </template> |
342 | 352 |
343 </template> | 353 </template> |
344 <script src="cups_add_printer_dialog.js"></script> | 354 <script src="cups_add_printer_dialog.js"></script> |
345 </dom-module> | 355 </dom-module> |
OLD | NEW |