diff options
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.h | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 19 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 8 |
4 files changed, 28 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index aaddb3b36f..1f7be72b1e 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -54,6 +54,7 @@ const static struct { | |||
54 | { SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, | 54 | { SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, |
55 | { SystemInfo::CurBootloaderName, ":platform:/bootloadername", "" }, | 55 | { SystemInfo::CurBootloaderName, ":platform:/bootloadername", "" }, |
56 | { SystemInfo::CurBootloaderFile, ":platform:/bootloaderfile", "" }, | 56 | { SystemInfo::CurBootloaderFile, ":platform:/bootloaderfile", "" }, |
57 | { SystemInfo::CurBootloaderFilter, ":platform:/bootloaderfilter", "" }, | ||
57 | { SystemInfo::CurEncoder, ":platform:/encoder", "" }, | 58 | { SystemInfo::CurEncoder, ":platform:/encoder", "" }, |
58 | { SystemInfo::CurBrand, ":platform:/brand", "" }, | 59 | { SystemInfo::CurBrand, ":platform:/brand", "" }, |
59 | { SystemInfo::CurName, ":platform:/name", "" }, | 60 | { SystemInfo::CurName, ":platform:/name", "" }, |
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index 77388fcd16..f8c31a9de3 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h | |||
@@ -58,6 +58,7 @@ class SystemInfo : public QObject | |||
58 | CurBootloaderMethod, | 58 | CurBootloaderMethod, |
59 | CurBootloaderName, | 59 | CurBootloaderName, |
60 | CurBootloaderFile, | 60 | CurBootloaderFile, |
61 | CurBootloaderFilter, | ||
61 | CurEncoder, | 62 | CurEncoder, |
62 | CurBrand, | 63 | CurBrand, |
63 | CurName, | 64 | CurName, |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index e23783a413..c740d35411 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -196,6 +196,7 @@ buildserver_modelname=iriverh100 | |||
196 | bootloadermethod=hex | 196 | bootloadermethod=hex |
197 | bootloadername=/iriver/bootloader-h100.bin | 197 | bootloadername=/iriver/bootloader-h100.bin |
198 | bootloaderfile=/ihp_100.hex | 198 | bootloaderfile=/ihp_100.hex |
199 | bootloaderfilter=*.hex *.zip | ||
199 | manualname=iriverh100 | 200 | manualname=iriverh100 |
200 | brand=Iriver | 201 | brand=Iriver |
201 | usbid=0x10063001 | 202 | usbid=0x10063001 |
@@ -208,6 +209,7 @@ buildserver_modelname=iriverh120 | |||
208 | bootloadermethod=hex | 209 | bootloadermethod=hex |
209 | bootloadername=/iriver/bootloader-h120.bin | 210 | bootloadername=/iriver/bootloader-h120.bin |
210 | bootloaderfile=/ihp_120.hex | 211 | bootloaderfile=/ihp_120.hex |
212 | bootloaderfilter=*.hex *.zip | ||
211 | manualname=iriverh100 | 213 | manualname=iriverh100 |
212 | brand=Iriver | 214 | brand=Iriver |
213 | usbid=0x10063002 | 215 | usbid=0x10063002 |
@@ -220,6 +222,7 @@ buildserver_modelname=iriverh300 | |||
220 | bootloadermethod=hex | 222 | bootloadermethod=hex |
221 | bootloadername=/iriver/bootloader-h300.bin | 223 | bootloadername=/iriver/bootloader-h300.bin |
222 | bootloaderfile=/H300.hex | 224 | bootloaderfile=/H300.hex |
225 | bootloaderfilter=*.hex *.zip | ||
223 | manualname=iriverh300 | 226 | manualname=iriverh300 |
224 | brand=Iriver | 227 | brand=Iriver |
225 | usbid=0x10063003 | 228 | usbid=0x10063003 |
@@ -452,6 +455,7 @@ buildserver_modelname=sansae200v2 | |||
452 | bootloadermethod=ams | 455 | bootloadermethod=ams |
453 | bootloadername=/sandisk-sansa/e200v2/bootloader-e200v2.sansa | 456 | bootloadername=/sandisk-sansa/e200v2/bootloader-e200v2.sansa |
454 | bootloaderfile=/e200pa.bin,/e200pe.bin,/e200pf.bin | 457 | bootloaderfile=/e200pa.bin,/e200pe.bin,/e200pf.bin |
458 | bootloaderfilter=*.bin *.zip | ||
455 | manualname= | 459 | manualname= |
456 | brand=Sandisk | 460 | brand=Sandisk |
457 | usbid=0x07817423 | 461 | usbid=0x07817423 |
@@ -465,6 +469,7 @@ buildserver_modelname=sansac200v2 | |||
465 | bootloadermethod=ams | 469 | bootloadermethod=ams |
466 | bootloadername=/sandisk-sansa/c200v2/bootloader-c200v2.sansa | 470 | bootloadername=/sandisk-sansa/c200v2/bootloader-c200v2.sansa |
467 | bootloaderfile=/c200pa.bin | 471 | bootloaderfile=/c200pa.bin |
472 | bootloaderfilter=*.bin *.zip | ||
468 | manualname= | 473 | manualname= |
469 | brand=Sandisk | 474 | brand=Sandisk |
470 | usbid=0x07817452 | 475 | usbid=0x07817452 |
@@ -478,6 +483,7 @@ buildserver_modelname=sansafuze | |||
478 | bootloadermethod=ams | 483 | bootloadermethod=ams |
479 | bootloadername=/sandisk-sansa/fuze/bootloader-fuze.sansa | 484 | bootloadername=/sandisk-sansa/fuze/bootloader-fuze.sansa |
480 | bootloaderfile=/fuzea.bin | 485 | bootloaderfile=/fuzea.bin |
486 | bootloaderfilter=*.bin *.zip | ||
481 | manualname= | 487 | manualname= |
482 | brand=Sandisk | 488 | brand=Sandisk |
483 | usbid=0x078174c1 | 489 | usbid=0x078174c1 |
@@ -491,6 +497,7 @@ buildserver_modelname=sansafuzev2 | |||
491 | bootloadermethod=ams | 497 | bootloadermethod=ams |
492 | bootloadername=/sandisk-sansa/fuzev2/bootloader-fuzev2.sansa | 498 | bootloadername=/sandisk-sansa/fuzev2/bootloader-fuzev2.sansa |
493 | bootloaderfile=/fuzpa.bin | 499 | bootloaderfile=/fuzpa.bin |
500 | bootloaderfilter=*.bin *.zip | ||
494 | manualname= | 501 | manualname= |
495 | brand=Sandisk | 502 | brand=Sandisk |
496 | usbid=0x078174c3 | 503 | usbid=0x078174c3 |
@@ -504,6 +511,7 @@ buildserver_modelname=sansafuzeplus | |||
504 | bootloadermethod=imx | 511 | bootloadermethod=imx |
505 | bootloadername=/sandisk-sansa/fuzeplus/bootloader-fuzeplus.sansa | 512 | bootloadername=/sandisk-sansa/fuzeplus/bootloader-fuzeplus.sansa |
506 | bootloaderfile=/firmware.sb | 513 | bootloaderfile=/firmware.sb |
514 | bootloaderfilter=*.sb *.zip | ||
507 | manualname= | 515 | manualname= |
508 | brand=Sandisk | 516 | brand=Sandisk |
509 | usbid=0x078174e1 | 517 | usbid=0x078174e1 |
@@ -517,6 +525,7 @@ buildserver_modelname=sansam200v4 | |||
517 | bootloadermethod=ams | 525 | bootloadermethod=ams |
518 | bootloadername=/sandisk-sansa/m200v4/bootloader-m200v4.sansa | 526 | bootloadername=/sandisk-sansa/m200v4/bootloader-m200v4.sansa |
519 | bootloaderfile=/m200a.bin | 527 | bootloaderfile=/m200a.bin |
528 | bootloaderfilter=*.bin *.zip | ||
520 | manualname= | 529 | manualname= |
521 | brand=Sandisk | 530 | brand=Sandisk |
522 | usbid= | 531 | usbid= |
@@ -531,6 +540,7 @@ buildserver_modelname=sansaclip | |||
531 | bootloadermethod=ams | 540 | bootloadermethod=ams |
532 | bootloadername=/sandisk-sansa/clip/bootloader-clip.sansa | 541 | bootloadername=/sandisk-sansa/clip/bootloader-clip.sansa |
533 | bootloaderfile=/m300a.bin | 542 | bootloaderfile=/m300a.bin |
543 | bootloaderfilter=*.bin *.zip | ||
534 | manualname= | 544 | manualname= |
535 | brand=Sandisk | 545 | brand=Sandisk |
536 | usbid=0x07817433 | 546 | usbid=0x07817433 |
@@ -544,6 +554,7 @@ buildserver_modelname=sansaclipv2 | |||
544 | bootloadermethod=ams | 554 | bootloadermethod=ams |
545 | bootloadername=/sandisk-sansa/clipv2/bootloader-clipv2.sansa | 555 | bootloadername=/sandisk-sansa/clipv2/bootloader-clipv2.sansa |
546 | bootloaderfile=/m30pa.bin | 556 | bootloaderfile=/m30pa.bin |
557 | bootloaderfilter=*.bin *.zip | ||
547 | manualname= | 558 | manualname= |
548 | brand=Sandisk | 559 | brand=Sandisk |
549 | usbid=0x07817435 | 560 | usbid=0x07817435 |
@@ -557,6 +568,7 @@ buildserver_modelname=sansaclipplus | |||
557 | bootloadermethod=ams | 568 | bootloadermethod=ams |
558 | bootloadername=/sandisk-sansa/clipplus/bootloader-clipplus.sansa | 569 | bootloadername=/sandisk-sansa/clipplus/bootloader-clipplus.sansa |
559 | bootloaderfile=/clppa.bin | 570 | bootloaderfile=/clppa.bin |
571 | bootloaderfilter=*.bin *.zip | ||
560 | manualname= | 572 | manualname= |
561 | brand=Sandisk | 573 | brand=Sandisk |
562 | usbid=0x078174d1 | 574 | usbid=0x078174d1 |
@@ -570,6 +582,7 @@ buildserver_modelname=sansaclipzip | |||
570 | bootloadermethod=ams | 582 | bootloadermethod=ams |
571 | bootloadername=/sandisk-sansa/clipzip/bootloader-clipzip.sansa | 583 | bootloadername=/sandisk-sansa/clipzip/bootloader-clipzip.sansa |
572 | bootloaderfile=/clpza.bin | 584 | bootloaderfile=/clpza.bin |
585 | bootloaderfilter=*.bin *.zip | ||
573 | manualname= | 586 | manualname= |
574 | brand=Sandisk | 587 | brand=Sandisk |
575 | usbid=0x078174e5 | 588 | usbid=0x078174e5 |
@@ -595,6 +608,7 @@ buildserver_modelname=ondavx747 | |||
595 | bootloadermethod=chinachip | 608 | bootloadermethod=chinachip |
596 | bootloadername=/onda/vx747/ccpmp.bin | 609 | bootloadername=/onda/vx747/ccpmp.bin |
597 | bootloaderfile=/SG301.HXF | 610 | bootloaderfile=/SG301.HXF |
611 | bootloaderfilter=*.hxf *.zip | ||
598 | manualname= | 612 | manualname= |
599 | brand=Onda | 613 | brand=Onda |
600 | usbid=0x07c4a4a5 | 614 | usbid=0x07c4a4a5 |
@@ -608,6 +622,7 @@ buildserver_modelname=ondavx747p | |||
608 | bootloadermethod=chinachip | 622 | bootloadermethod=chinachip |
609 | bootloadername=/onda/vx747p/ccpmp.bin | 623 | bootloadername=/onda/vx747p/ccpmp.bin |
610 | bootloaderfile=/SG301.HXF | 624 | bootloaderfile=/SG301.HXF |
625 | bootloaderfilter=*.hxf *.zip | ||
611 | manualname= | 626 | manualname= |
612 | brand=Onda | 627 | brand=Onda |
613 | usbid=0x07c4a4a5 | 628 | usbid=0x07c4a4a5 |
@@ -621,6 +636,7 @@ buildserver_modelname=ondavx777 | |||
621 | bootloadermethod=chinachip | 636 | bootloadermethod=chinachip |
622 | bootloadername=/onda/vx777/ccpmp.bin | 637 | bootloadername=/onda/vx777/ccpmp.bin |
623 | bootloaderfile=/VX777.HXF | 638 | bootloaderfile=/VX777.HXF |
639 | bootloaderfilter=*.hxf *.zip | ||
624 | manualname= | 640 | manualname= |
625 | brand=Onda | 641 | brand=Onda |
626 | usbid=0x07c4a4a5 | 642 | usbid=0x07c4a4a5 |
@@ -670,6 +686,7 @@ buildserver_modelname=cowond2 | |||
670 | bootloadermethod=tcc | 686 | bootloadermethod=tcc |
671 | bootloadername=/cowon/d2/bootloader-cowond2.bin | 687 | bootloadername=/cowon/d2/bootloader-cowond2.bin |
672 | bootloaderfile=/ | 688 | bootloaderfile=/ |
689 | bootloaderfilter=*.bin *.zip | ||
673 | manualname= | 690 | manualname= |
674 | brand=Cowon | 691 | brand=Cowon |
675 | usbid=0x0e210800, 0x0e210860, 0x0e210870, 0x0e210880, 0x0e210890 | 692 | usbid=0x0e210800, 0x0e210860, 0x0e210870, 0x0e210880, 0x0e210890 |
@@ -697,6 +714,7 @@ buildserver_modelname=mpiohd200 | |||
697 | bootloadermethod=mpio | 714 | bootloadermethod=mpio |
698 | bootloadername=/mpiohd200/bootloader.mpio | 715 | bootloadername=/mpiohd200/bootloader.mpio |
699 | bootloaderfile=/SYSTEM/HD200_UPG.SYS | 716 | bootloaderfile=/SYSTEM/HD200_UPG.SYS |
717 | bootloaderfilter=*.bin *.zip | ||
700 | manualname= | 718 | manualname= |
701 | brand=MPIO | 719 | brand=MPIO |
702 | usbid=0x27351004 | 720 | usbid=0x27351004 |
@@ -709,6 +727,7 @@ buildserver_modelname=mpiohd300 | |||
709 | bootloadermethod=mpio | 727 | bootloadermethod=mpio |
710 | bootloadername=/mpiohd300/bootloader.mpio | 728 | bootloadername=/mpiohd300/bootloader.mpio |
711 | bootloaderfile=/SYSTEM/HD300_UPG.SYS | 729 | bootloaderfile=/SYSTEM/HD300_UPG.SYS |
730 | bootloaderfilter=*.bin *.zip | ||
712 | manualname= | 731 | manualname= |
713 | brand=MPIO | 732 | brand=MPIO |
714 | usbid=0x27351005 | 733 | usbid=0x27351005 |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 683f17c0af..5c496585ec 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -760,8 +760,14 @@ void RbUtilQt::installBootloader() | |||
760 | } | 760 | } |
761 | // open dialog to browse to of file | 761 | // open dialog to browse to of file |
762 | QString offile; | 762 | QString offile; |
763 | QString filter | ||
764 | = SystemInfo::value(SystemInfo::CurBootloaderFilter).toString(); | ||
765 | if(!filter.isEmpty()) { | ||
766 | filter = tr("Bootloader files (%1)").arg(filter) + ";;"; | ||
767 | } | ||
768 | filter += tr("All files (*)"); | ||
763 | offile = QFileDialog::getOpenFileName(this, | 769 | offile = QFileDialog::getOpenFileName(this, |
764 | tr("Select firmware file"), QDir::homePath()); | 770 | tr("Select firmware file"), QDir::homePath(), filter); |
765 | if(!QFileInfo(offile).isReadable()) { | 771 | if(!QFileInfo(offile).isReadable()) { |
766 | logger->addItem(tr("Error opening firmware file"), LOGERROR); | 772 | logger->addItem(tr("Error opening firmware file"), LOGERROR); |
767 | logger->setFinished(); | 773 | logger->setFinished(); |