• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revision4e3b05fc0a0b1da1fdd8186e1a5dab52d0dbb8fc (tree)
Time2018-04-13 02:23:32
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

Merge branch 'master' of github.com:Artanejp/common_source_project-fm7

Change Summary

Incremental Difference

--- a/source/src/qt/common/qt_utils.cpp
+++ b/source/src/qt/common/qt_utils.cpp
@@ -618,8 +618,13 @@ void SetFDOptions(QCommandLineParser *cmdparser)
618618 QString sfdType1 = QString::fromUtf8("fd%1").arg(i);
619619 QString sfdType2 = QString::fromUtf8("vFd%1").arg(i);
620620 QString sfdType3 = QString::fromUtf8("vFloppyDisk%1").arg(i);
621- _opt_fds[i] = new QCommandLineOption({sfdType1, sfdType2, sfdType3},QCoreApplication::translate("main", "Set virtual floppy disk %1.").arg(i) , "[D88_SLOT@]fullpath");
621+ QStringList _cl;
622+ _cl.append(sfdType1);
623+ _cl.append(sfdType2);
624+ _cl.append(sfdType3);
625+ _opt_fds[i] = new QCommandLineOption(_cl,QCoreApplication::translate("main", "Set virtual floppy disk %1.").arg(i) , "[D88_SLOT@]fullpath");
622626 cmdparser->addOption(*_opt_fds[i]);
627+ _cl.clear();
623628 }
624629 #endif
625630 }
@@ -630,8 +635,12 @@ void SetBinaryOptions(QCommandLineParser *cmdparser)
630635 for(int i = 0; i < MAX_BINARY; i++) {
631636 QString sfdType1 = QString::fromUtf8("bin%1").arg(i);
632637 QString sfdType2 = QString::fromUtf8("vBinary%1").arg(i);
633- _opt_binaries[i] = new QCommandLineOption({sfdType1, sfdType2},QCoreApplication::translate("main", "Set virtual binary image %1.").arg(i) , "fullpath");
638+ QStringList _cl;
639+ _cl.append(sfdType1);
640+ _cl.append(sfdType2);
641+ _opt_binaries[i] = new QCommandLineOption(_cl,QCoreApplication::translate("main", "Set virtual binary image %1.").arg(i) , "fullpath");
634642 cmdparser->addOption(*_opt_binaries[i]);
643+ _cl.clear();
635644 }
636645 #endif
637646 }
@@ -643,8 +652,13 @@ void SetCartOptions(QCommandLineParser *cmdparser)
643652 QString sfdType1 = QString::fromUtf8("cart%1").arg(i);
644653 QString sfdType2 = QString::fromUtf8("vCart%1").arg(i);
645654 QString sfdType3 = QString::fromUtf8("vCartridge%1").arg(i);
646- _opt_carts[i] = new QCommandLineOption({sfdType1, sfdType2, sfdType3},QCoreApplication::translate("main", "Set virtual cartridge %1 (mostly ROM).").arg(i) , "fullpath");
655+ QStringList _cl;
656+ _cl.append(sfdType1);
657+ _cl.append(sfdType2);
658+ _cl.append(sfdType3);
659+ _opt_carts[i] = new QCommandLineOption(_cl,QCoreApplication::translate("main", "Set virtual cartridge %1 (mostly ROM).").arg(i) , "fullpath");
647660 cmdparser->addOption(*_opt_carts[i]);
661+ _cl.clear();
648662 }
649663 #endif
650664 }
@@ -654,7 +668,10 @@ void SetBubbleOptions(QCommandLineParser *cmdparser)
654668 for(int i = 0; i < MAX_BUBBLE; i++) {
655669 QString sfdType1 = QString::fromUtf8("bub%1").arg(i);
656670 QString sfdType2 = QString::fromUtf8("vBubble%1").arg(i);
657- _opt_bubbles[i] = new QCommandLineOption({sfdType1, sfdType2},QCoreApplication::translate("main", "Set virtual bubble cartridge %1.").arg(i) , "[B88_SLOT@]fullpath");
671+ QStringList _cl;
672+ _cl.append(sfdType1);
673+ _cl.append(sfdType2);
674+ _opt_bubbles[i] = new QCommandLineOption(_cl,QCoreApplication::translate("main", "Set virtual bubble cartridge %1.").arg(i) , "[B88_SLOT@]fullpath");
658675 cmdparser->addOption(*_opt_bubbles[i]);
659676 }
660677 #endif
@@ -666,8 +683,12 @@ void SetLDOptions(QCommandLineParser *cmdparser)
666683 for(int i = 0; i < 1; i++) {
667684 QString sfdType1 = QString::fromUtf8("ld%1").arg(i);
668685 QString sfdType2 = QString::fromUtf8("vLaserDisc%1").arg(i);
669- _opt_lds[i] = new QCommandLineOption({sfdType1, sfdType2},QCoreApplication::translate("main", "Set virtual laser disc %1 (mostly movie file).").arg(i) , "fullpath");
686+ QStringList _cl;
687+ _cl.append(sfdType1);
688+ _cl.append(sfdType2);
689+ _opt_lds[i] = new QCommandLineOption(_cl, QCoreApplication::translate("main", "Set virtual laser disc %1 (mostly movie file).").arg(i) , "fullpath");
670690 cmdparser->addOption(*_opt_lds[i]);
691+ _cl.clear();
671692 }
672693 #endif
673694 }
@@ -677,8 +698,12 @@ void SetCDOptions(QCommandLineParser *cmdparser)
677698 for(int i = 0; i < 1; i++) {
678699 QString sfdType1 = QString::fromUtf8("cd%1").arg(i);
679700 QString sfdType2 = QString::fromUtf8("vCompactDisc%1").arg(i);
680- _opt_cds[i] = new QCommandLineOption({sfdType1, sfdType2},QCoreApplication::translate("main", "Set virtual compact disc %1.").arg(i) , "fullpath");
701+ QStringList _cl;
702+ _cl.append(sfdType1);
703+ _cl.append(sfdType2);
704+ _opt_cds[i] = new QCommandLineOption(_cl,QCoreApplication::translate("main", "Set virtual compact disc %1.").arg(i) , "fullpath");
681705 cmdparser->addOption(*_opt_cds[i]);
706+ _cl.clear();
682707 }
683708 #endif
684709 }
@@ -691,8 +716,14 @@ void SetCmtOptions(QCommandLineParser *cmdparser)
691716 QString sfdType2 = QString::fromUtf8("tape%1").arg(i);
692717 QString sfdType3 = QString::fromUtf8("vCmt%1").arg(i);
693718 QString sfdType4 = QString::fromUtf8("vTape%1").arg(i);
694- _opt_cmts[i] = new QCommandLineOption({sfdType1, sfdType2, sfdType3, sfdType4},QCoreApplication::translate("main", "Set virtual casette tape %1.").arg(i) , "fullpath");
719+ QStringList _cl;
720+ _cl.append(sfdType1);
721+ _cl.append(sfdType2);
722+ _cl.append(sfdType3);
723+ _cl.append(sfdType4);
724+ _opt_cmts[i] = new QCommandLineOption(_cl, QCoreApplication::translate("main", "Set virtual casette tape %1.").arg(i) , "fullpath");
695725 cmdparser->addOption(*_opt_cmts[i]);
726+ _cl.clear();
696727 }
697728 #endif
698729 }
@@ -703,8 +734,13 @@ void SetQuickDiskOptions(QCommandLineParser *cmdparser)
703734 for(int i = 0; i < MAX_QD; i++) {
704735 QString sfdType1 = QString::fromUtf8("qd%1").arg(i);
705736 QString sfdType2 = QString::fromUtf8("vQuickDisk%1").arg(i);
706- _opt_qds[i] = new QCommandLineOption({sfdType1, sfdType2},QCoreApplication::translate("main", "Set virtual quick disk %1.").arg(i) , "fullpath");
737+
738+ QStringList _cl;
739+ _cl.append(sfdType1);
740+ _cl.append(sfdType2);
741+ _opt_qds[i] = new QCommandLineOption(_cl, QCoreApplication::translate("main", "Set virtual quick disk %1.").arg(i) , "fullpath");
707742 cmdparser->addOption(*_opt_qds[i]);
743+ _cl.clear();
708744 }
709745 #endif
710746 }
@@ -846,14 +882,33 @@ void SetOptions(QCommandLineParser *cmdparser)
846882 cmdparser->setApplicationDescription(emudesc);
847883 cmdparser->addHelpOption();
848884 //cmdparser->addVersionOption();
849-
850- _opt_homedir = new QCommandLineOption({"d", "homedir"}, QCoreApplication::translate("main", "Custom home directory."), "homedir");
851- _opt_cfgfile = new QCommandLineOption({"c", "cfgfile"}, QCoreApplication::translate("main", "Custom config file (without path)."), "cfgfile");
885+ QStringList _cl;
886+ _cl.append("d");
887+ _cl.append("homedir");
888+ _opt_homedir = new QCommandLineOption(_cl, QCoreApplication::translate("main", "Custom home directory."), "homedir");
889+ _cl.clear();
890+
891+ _cl.append("c");
892+ _cl.append("cfgfile");
893+ _opt_cfgfile = new QCommandLineOption(_cl, QCoreApplication::translate("main", "Custom config file (without path)."), "cfgfile");
894+ _cl.clear();
895+
852896 _opt_cfgdir = new QCommandLineOption("cfgdir", QCoreApplication::translate("main", "Custom config directory."), "cfgdir");
853- _opt_resdir = new QCommandLineOption({"r", "resdir"}, QCoreApplication::translate("main", "Custom resource directory (ROMs, WAVs, etc)."), "resdir");
854- _opt_dipsw_on = new QCommandLineOption({"on", "dipsw-on"}, QCoreApplication::translate("main", "Turn on <onbit> of dip switch."), "onbit");
855- _opt_dipsw_off = new QCommandLineOption({"off", "dipsw-off"}, QCoreApplication::translate("main", "Turn off <offbit> of dip switch."), "offbit");
856897
898+ _cl.append("r");
899+ _cl.append("res");
900+ _opt_resdir = new QCommandLineOption(_cl, QCoreApplication::translate("main", "Custom resource directory (ROMs, WAVs, etc)."), "resdir");
901+ _cl.clear();
902+
903+ _cl.append("on");
904+ _cl.append("dipsw-on");
905+ _opt_dipsw_on = new QCommandLineOption(_cl, QCoreApplication::translate("main", "Turn on <onbit> of dip switch."), "onbit");
906+ _cl.clear();
907+
908+ _cl.append("off");
909+ _cl.append("dipsw-off");
910+ _opt_dipsw_off = new QCommandLineOption(_cl, QCoreApplication::translate("main", "Turn off <offbit> of dip switch."), "offbit");
911+ _cl.clear();
857912 for(int i = 0; i < 8; i++) {
858913 _opt_fds[i] = NULL;
859914 _opt_qds[i] = NULL;
Show on old repository browser