Skip to content

Commit

Permalink
minor update refactoring and translation
Browse files Browse the repository at this point in the history
  • Loading branch information
@apinprastya
apinprastya committed May 4, 2018
1 parent e11b7ce commit 970f1b9
Show file tree
Hide file tree
Showing 4 changed files with 184 additions and 169 deletions.
18 changes: 9 additions & 9 deletions libgui/admin/importexportdatabasedialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void ImportExportDatabaseDialog::messageReceived(Message *msg)
file.close();
}
}
GuiUtil::enableWidget(true, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(true, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
} else {
mGDrive->uploadFile(QByteArray::fromBase64(msg->data("data").toString().toUtf8()));
}
Expand All @@ -102,7 +102,7 @@ void ImportExportDatabaseDialog::messageReceived(Message *msg)
} else {
QMessageBox::critical(this, tr("Error"), msg->data("error").toString());
}
GuiUtil::enableWidget(true, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(true, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
}
}

Expand All @@ -111,7 +111,7 @@ bool ImportExportDatabaseDialog::eventFilter(QObject *obj, QEvent *event)
auto webview = qobject_cast<BrowserDialog*>(obj);
if(webview != nullptr) {
if(event->type() == QEvent::Close && !mGDriveInProcess)
GuiUtil::enableWidget(true, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(true, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
}
return QDialog::eventFilter(obj, event);
}
Expand All @@ -122,7 +122,7 @@ void ImportExportDatabaseDialog::exportFile()
Message msg(MSG_TYPE::DATABASE, MSG_COMMAND::EXPORT);
msg.addData("version", qApp->applicationVersion());
sendMessage(&msg);
GuiUtil::enableWidget(false, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(false, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
}

void ImportExportDatabaseDialog::exportGDrive()
Expand All @@ -131,14 +131,14 @@ void ImportExportDatabaseDialog::exportGDrive()
mIsGDrive = true;
mIsExport = true;
mO2Google->link();
GuiUtil::enableWidget(false, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(false, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
}

void ImportExportDatabaseDialog::importFile()
{
const QString &filename = QFileDialog::getOpenFileName(this, tr("Import database"), QDir::homePath(), "*.sltn");
if(!filename.isEmpty()) {
GuiUtil::enableWidget(false, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(false, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
Message msg(MSG_TYPE::DATABASE, MSG_COMMAND::IMPORT);
QFile f(filename);
if(f.open(QFile::ReadOnly)) {
Expand All @@ -155,7 +155,7 @@ void ImportExportDatabaseDialog::importGDrive()
mIsGDrive = true;
mIsExport = false;
mO2Google->link();
GuiUtil::enableWidget(false, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(false, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
}

void ImportExportDatabaseDialog::onLinkingFailed()
Expand Down Expand Up @@ -198,7 +198,7 @@ void ImportExportDatabaseDialog::onCloseBrowser()

void ImportExportDatabaseDialog::uploadGDriveDone()
{
GuiUtil::enableWidget(true, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(true, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
}

void ImportExportDatabaseDialog::onFileListed(const QJsonArray &arr)
Expand All @@ -210,7 +210,7 @@ void ImportExportDatabaseDialog::onFileListed(const QJsonArray &arr)
if(!fileId.isEmpty()) {
mGDrive->downloadFile(fileId);
} else {
GuiUtil::enableWidget(true, QList<QWidget*>() << ui->pushExportToFile << ui->pushExportToGDrive << ui->pushImportFile << ui->pushImportGDrive);
GuiUtil::enableWidget(true, QList<QWidget*>{ui->pushExportToFile, ui->pushExportToGDrive, ui->pushImportFile, ui->pushImportGDrive});
}
}

Expand Down
64 changes: 32 additions & 32 deletions libgui/setting/settingwidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,55 +637,38 @@
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>Barcode Max Length</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QSpinBox" name="spinBarcodeLength">
<property name="minimum">
<number>4</number>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
<item row="10" column="0">
<item row="11" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>Line Feed After</string>
</property>
</widget>
</item>
<item row="10" column="1">
<item row="11" column="1">
<widget class="QSpinBox" name="spinCashierLinefeed"/>
</item>
<item row="11" column="0">
<item row="12" column="0">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Open Drawer</string>
</property>
</widget>
</item>
<item row="11" column="1">
<item row="12" column="1">
<widget class="QCheckBox" name="checkPrintCashierDrawer">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="12" column="0">
<item row="13" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>Auto Cut</string>
</property>
</widget>
</item>
<item row="12" column="1">
<item row="13" column="1">
<widget class="QCheckBox" name="checkPrintCashierCut">
<property name="text">
<string/>
Expand All @@ -702,6 +685,20 @@
<item row="3" column="1">
<widget class="QComboBox" name="comboUsb"/>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_38">
<property name="text">
<string>Only CPI 10</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QCheckBox" name="checkOnly10">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -797,31 +794,34 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>Show barcode</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QCheckBox" name="checkShowBarcode">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_38">
<item row="5" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>Only CPI 10</string>
<string>Barcode Max Length</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="checkOnly10">
<property name="text">
<string/>
<item row="5" column="1">
<widget class="QSpinBox" name="spinBarcodeLength">
<property name="minimum">
<number>4</number>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
Expand Down
Binary file modified translation/libgui_id.qm
View file
Binary file not shown.
Loading

0 comments on commit 970f1b9

Please sign in to comment.