easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework cma protocol selection.

Browse Source 
Read plugins from current application directory on debug mode.
This commit is contained in:
codestation
2015-02-14 22:03:53 -04:30
parent 4fa13bd9ec
commit ea67001531
8 changed files with 132 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/forms/configwidget.cpp
View File

@@ -62,6 +62,32 @@ void ConfigWidget::connectSignals()
connect(mapper, SIGNAL(mapped(int)), this, SLOT(browseBtnPressed(int)));
connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(ui->protocolModeBox, SIGNAL(currentIndexChanged(int)), this, SLOT(protocolModeChanged(int)));
}
void ConfigWidget::protocolModeChanged(int index)
{
switch(index)
{
case 0:
ui->protocolBox->setEnabled(false);
ui->protocolEdit->setEnabled(false);
break;
case 1:
ui->protocolBox->setEnabled(true);
ui->protocolEdit->setEnabled(false);
break;
case 2:
ui->protocolBox->setEnabled(false);
ui->protocolEdit->setEnabled(true);
break;
default:
ui->protocolBox->setEnabled(false);
ui->protocolEdit->setEnabled(false);
break;
}
}
void ConfigWidget::setDefaultData()
@@ -99,7 +125,17 @@ void ConfigWidget::setDefaultData()
ui->videoSkipCheck->setChecked(settings.value("videoSkip", false).toBool());
ui->musicSkipCheck->setChecked(settings.value("musicSkip", false).toBool());
ui->customProtocolCheckBox->setChecked(settings.value("useCustomProtocol", false).toBool());
QString protocol_mode = settings.value("protocolMode", "automatic").toString();
if(protocol_mode == "manual")
ui->protocolModeBox->setCurrentIndex(1);
else if(protocol_mode == "custom")
ui->protocolModeBox->setCurrentIndex(2);
else
ui->protocolModeBox->setCurrentIndex(0);
protocolModeChanged(ui->protocolModeBox->currentIndex());
ui->protocolBox->setCurrentIndex(settings.value("protocolIndex", 0).toInt());
bool ok;
@@ -190,9 +226,15 @@ void ConfigWidget::accept()
settings.setValue("photoSkip", ui->photoSkipCheck->isChecked());
settings.setValue("videoSkip", ui->videoSkipCheck->isChecked());
settings.setValue("musicSkip", ui->musicSkipCheck->isChecked());
settings.setValue("useCustomProtocol", ui->customProtocolCheckBox->isChecked());
settings.setValue("protocolIndex", ui->protocolBox->currentIndex());
if(ui->protocolModeBox->currentIndex() == 0)
settings.setValue("protocolMode", "automatic");
else if(ui->protocolModeBox->currentIndex() == 1)
settings.setValue("protocolMode", "manual");
else if(ui->protocolModeBox->currentIndex() == 2)
settings.setValue("protocolMode", "custom");
bool ok;
int protocol = ui->protocolEdit->text().toInt(&ok);

1
src/forms/configwidget.h
View File

@@ -47,6 +47,7 @@ private:
Ui::ConfigWidget *ui;
private slots:
void protocolModeChanged(int index);
void browseBtnPressed(int from);
void accept();
};

60
src/forms/configwidget.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>532</width>
<height>457</height>
<width>519</width>
<height>525</height>
</rect>
</property>
<property name="windowTitle">
@@ -375,17 +375,17 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>CMA Protocol version</string>
<string>CMA protocol version</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<item row="1" column="1">
<widget class="QComboBox" name="protocolBox">
<property name="minimumSize">
<size>
@@ -425,34 +425,27 @@
</item>
<item>
<property name="text">
<string>FW 1.80 - 1300010</string>
<string notr="true">FW 1.80 - 1300010</string>
</property>
</item>
<item>
<property name="text">
<string>FW 1.60 - 1200010</string>
<string notr="true">FW 1.60 - 1200010</string>
</property>
</item>
<item>
<property name="text">
<string>FW 1.50 - 1100010</string>
<string notr="true">FW 1.50 - 1100010</string>
</property>
</item>
<item>
<property name="text">
<string>FW 1.00 - 1000010</string>
<string notr="true">FW 1.00 - 1000010</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="customProtocolCheckBox">
<property name="text">
<string>Use custom version</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="1">
<widget class="QLineEdit" name="protocolEdit">
<property name="inputMask">
<string notr="true">9999999</string>
@@ -462,6 +455,39 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>CMA protocol selection</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="protocolModeBox">
<item>
<property name="text">
<string>Latest</string>
</property>
</item>
<item>
<property name="text">
<string>Manual</string>
</property>
</item>
<item>
<property name="text">
<string>Custom</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>CMA custom version</string>
</property>
</widget>
</item>
</layout>
</item>
<item>