Commit b563a2b2 authored by coin-server's avatar coin-server

Merge branch 'Aviator/QT-Uri' into 'master'

Aviator/qt uri

See merge request ProjectMerge/merge!31
parents b92fa1e3 9597d1fc
......@@ -73,7 +73,7 @@ extern double NSAppKitVersionNumber;
#endif
#endif
#define URI_SCHEME "MERGE"
#define URI_SCHEME "merge"
namespace GUIUtil
{
......
......@@ -17,7 +17,7 @@ OpenURIDialog::OpenURIDialog(QWidget* parent) : QDialog(parent),
ui(new Ui::OpenURIDialog)
{
ui->setupUi(this);
ui->uriEdit->setPlaceholderText("pivx:");
ui->uriEdit->setPlaceholderText("merge:");
}
OpenURIDialog::~OpenURIDialog()
......@@ -47,6 +47,6 @@ void OpenURIDialog::on_selectFileButton_clicked()
if (filename.isEmpty())
return;
QUrl fileUri = QUrl::fromLocalFile(filename);
ui->uriEdit->setText("MERGE:?r=" + QUrl::toPercentEncoding(fileUri.toString()));
ui->uriEdit->setText("merge:?r=" + QUrl::toPercentEncoding(fileUri.toString()));
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment