Skip to content

Commit

Permalink
Revert "feat: mac action (barry-ran#86)" (barry-ran#87)
Browse files Browse the repository at this point in the history
This reverts commit a6f516e.
  • Loading branch information
barry-ran authored Feb 22, 2020
1 parent a6f516e commit 5ff64da
Show file tree
Hide file tree
Showing 21 changed files with 189 additions and 816 deletions.
124 changes: 0 additions & 124 deletions .github/workflows/macos.yml

This file was deleted.

149 changes: 0 additions & 149 deletions .github/workflows/windows.yml

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@
/build/
build-*
*.DS_Store
userdata.ini
2 changes: 1 addition & 1 deletion QtScrcpy/QtScrcpy.pro
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ macos {
QMAKE_BUNDLE_DATA += APP_FFMPEG

APP_CONFIG.files = $$files($$PWD/../config/config.ini)
APP_CONFIG.path = Contents/MacOS/config
APP_CONFIG.path = Contents/MacOS
QMAKE_BUNDLE_DATA += APP_CONFIG

# mac application icon
Expand Down
22 changes: 3 additions & 19 deletions QtScrcpy/dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,21 @@ void Dialog::initUI()
ui->bitRateBox->addItem("6000000");
ui->bitRateBox->addItem("8000000");
ui->bitRateBox->addItem("10000000");
ui->bitRateBox->setCurrentIndex(Config::getInstance().getBitRateIndex());
ui->bitRateBox->setCurrentIndex(2);

ui->maxSizeBox->addItem("640");
ui->maxSizeBox->addItem("720");
ui->maxSizeBox->addItem("1080");
ui->maxSizeBox->addItem("1280");
ui->maxSizeBox->addItem("1920");
ui->maxSizeBox->addItem(tr("original"));
ui->maxSizeBox->setCurrentIndex(Config::getInstance().getMaxSizeIndex());
ui->maxSizeBox->setCurrentIndex(2);

ui->formatBox->addItem("mp4");
ui->formatBox->addItem("mkv");
ui->formatBox->setCurrentIndex(Config::getInstance().getRecordFormatIndex());

ui->recordPathEdt->setText(Config::getInstance().getRecordPath());
}
}

void Dialog::execAdbCmd()
{
Expand Down Expand Up @@ -359,18 +358,3 @@ void Dialog::on_recordScreenCheck_clicked(bool checked)
ui->recordScreenCheck->setChecked(false);
}
}

void Dialog::on_bitRateBox_activated(int index)
{
Config::getInstance().setBitRateIndex(index);
}

void Dialog::on_maxSizeBox_activated(int index)
{
Config::getInstance().setMaxSizeIndex(index);
}

void Dialog::on_formatBox_activated(int index)
{
Config::getInstance().setRecordFormatIndex(index);
}
6 changes: 0 additions & 6 deletions QtScrcpy/dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ private slots:

void on_recordScreenCheck_clicked(bool checked);

void on_bitRateBox_activated(int index);

void on_maxSizeBox_activated(int index);

void on_formatBox_activated(int index);

private:
bool checkAdbRun();
void initUI();
Expand Down
5 changes: 2 additions & 3 deletions QtScrcpy/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ int main(int argc, char *argv[])
qputenv("QTSCRCPY_ADB_PATH", "../../../../third_party/adb/win/adb.exe");
qputenv("QTSCRCPY_SERVER_PATH", "../../../../third_party/scrcpy-server");
qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../keymap");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../../config");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../../config/config.ini");
#endif

#ifdef Q_OS_LINUX
qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/linux/adb");
qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../config");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../config/config.ini");
#endif

//加载样式表
Expand All @@ -77,7 +77,6 @@ int main(int argc, char *argv[])
g_mainDlg->setWindowTitle(Config::getInstance().getTitle());
g_mainDlg->show();

qInfo(QObject::tr("This software is completely open source and free, you can download it at the following address:").toUtf8());
qInfo(QString("QtScrcpy %1 <https://github.com/barry-ran/QtScrcpy>").arg(QCoreApplication::applicationVersion()).toUtf8());

int ret = a.exec();
Expand Down
Binary file modified QtScrcpy/res/i18n/QtScrcpy_en.qm
Binary file not shown.
10 changes: 1 addition & 9 deletions QtScrcpy/res/i18n/QtScrcpy_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</message>
<message>
<location filename="../../dialog.ui" line="144"/>
<location filename="../../dialog.cpp" line="294"/>
<location filename="../../dialog.cpp" line="293"/>
<source>select path</source>
<translation>select path</translation>
</message>
Expand Down Expand Up @@ -203,14 +203,6 @@
<translation>original</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="../../main.cpp" line="80"/>
<source>This software is completely open source and free, you can download it at the following address:</source>
<translation>This software is completely open source and free, you can download it at the following address:</translation>
</message>
</context>
<context>
<name>ToolForm</name>
<message>
Expand Down
Binary file modified QtScrcpy/res/i18n/QtScrcpy_zh.qm
Binary file not shown.
Loading

0 comments on commit 5ff64da

Please sign in to comment.