Skip to content
This repository was archived by the owner on Mar 6, 2021. It is now read-only.

Commit dbadf5e

Browse files
committed
New Version
Bug fixes, Korean translation added
1 parent b9a0367 commit dbadf5e

File tree

9 files changed

+28
-23
lines changed

9 files changed

+28
-23
lines changed

src/about.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define ABOUT_H
33

44
#include <QDialog>
5+
#include <QIcon>
56

67
namespace Ui {
78
class About;
@@ -12,7 +13,7 @@ class About : public QDialog
1213
Q_OBJECT
1314

1415
public:
15-
explicit About(QWidget *parent = 0);
16+
explicit About(QWidget *parent = nullptr);
1617
~About();
1718

1819
private:

src/about.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</size>
3636
</property>
3737
<property name="text">
38-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;GoodByeDPI GUI&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Geliştirici (Developer): &lt;span style=&quot; font-weight:600;&quot;&gt;hex4d0r&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Kaynak Kod&lt;/span&gt; (Source Code)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://github.com/hex4d0r/GUI-for-GoodbyeDPI&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;GitHub&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Bağış(Support)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://www.patreon.com/hex4d0r&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;Patreon&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Credits&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://github.com/ValdikSS/GoodbyeDPI&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;ValdikSS/GoodByeDPI&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
38+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;GoodByeDPI GUI&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Geliştirici (Developer): &lt;span style=&quot; font-weight:600;&quot;&gt;include&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Kaynak Kod&lt;/span&gt; (Source Code)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://github.com/include-sys/GUI-for-GoodbyeDPI&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;GitHub&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Credits&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://github.com/ValdikSS/GoodbyeDPI&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;ValdikSS/GoodByeDPI&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
3939
</property>
4040
<property name="alignment">
4141
<set>Qt::AlignCenter</set>
File renamed without changes.
File renamed without changes.

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
2626

2727
else
2828
{
29-
t.load(":/english.qm");
29+
t.load(":/lang_en.qm");
3030
a.installTranslator(&t);
3131
}
3232

src/mainwindow.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
MainWindow::MainWindow(QStringList arguments, QWidget *parent) :
1414
QMainWindow(parent),
15-
ayarlar(new Settings()),
15+
ui(new Ui::MainWindow),
16+
tmpDir(new QTemporaryDir()),
1617
settings(new QSettings("HexOpenSource", "GBDPI-GUI", this)),
1718
trayIcon(new QSystemTrayIcon(this)),
1819
trayMenu(new QMenu(this)),
@@ -22,16 +23,17 @@ MainWindow::MainWindow(QStringList arguments, QWidget *parent) :
2223
startAction(new QAction(QIcon(":/images/images/play-button.png"), tr("Başlat"), this)),
2324
stopAction(new QAction(QIcon(":/images/images/stop-button.png"), tr("Durdur"), this)),
2425
settingsAction(new QAction(QIcon(":/images/images/settings-gears-button.png"), tr("Ayarlar"), this)),
25-
tmpDir(new QTemporaryDir()),
2626
proc(new QProcess(this)),
27-
ui(new Ui::MainWindow)
27+
ayarlar(new Settings())
28+
29+
2830
{
2931
ui->setupUi(this);
3032
setWindowTitle("GoodByeDPI GUI");
3133
setWindowIcon(QIcon(":/images/images/icon.ico"));
3234

3335
trayIcon->setIcon(QIcon(":/images/images/icon.ico"));
34-
trayIcon->setToolTip("GoodByeDPI GUI by hex4d0r");
36+
trayIcon->setToolTip("GoodByeDPI GUI by include");
3537

3638
ui->labelParameters->setWordWrap(true);
3739

@@ -148,10 +150,11 @@ void MainWindow::closeEvent(QCloseEvent *event)
148150

149151
void MainWindow::procStart()
150152
{
151-
proc->setArguments(prepareParameters(ui->comboParametre->isEnabled()));
152-
//ui->debugArea->appendPlainText("[*] " + ui->comboParametre->currentText());
153-
//ui->debugArea->appendPlainText("Exe Path: " + QDir::currentPath() + "/goodbyedpi/goodbyedpi.exe");
154-
proc->start(QDir::currentPath() + "/goodbyedpi/goodbyedpi.exe", QProcess::ReadOnly);
153+
//proc->setArguments(prepareParameters(ui->comboParametre->isEnabled()));
154+
//ui->debugArea->appendPlainText("\"" + QDir::currentPath() + QString("/goodbyedpi/goodbyedpi.exe\"") + " " +prepareParameters(ui->comboParametre->isEnabled()).join(" "));
155+
//It's only way GoodbyeDPI works, because no matter what I try, It crashes with different arguments except "-1" If I use argument list method like start(program, arglist, mode)
156+
//I have to add manual "(quotes) for PATHs that contains space, because It start function tries to execute it like command prompt and you can't use space char at command prompt.
157+
proc->start("\"" + QDir::currentPath() + QString("/goodbyedpi/goodbyedpi.exe\"") + " " +prepareParameters(ui->comboParametre->isEnabled()).join(" "), QProcess::ReadOnly);
155158
proc->waitForStarted(1000);
156159

157160
if(!settings->value("System/disableNotifications").toBool() && !this->isVisible())
@@ -299,16 +302,16 @@ QStringList MainWindow::prepareParameters(bool isComboParametreEnabled)
299302
defaultparameters << "-1 --blacklist blacklist.txt";
300303
break;
301304
case 1:
302-
defaultparameters << "-1 --dns-addr 1.1.1.1 --dns-port 1253 --dnsv6-addr 2a02:6b8::feed:0ff --dnsv6-port 1253 --blacklist blacklist.txt";
305+
defaultparameters << "-1 --dns-addr 1.1.1.1 --dns-port 1253 --blacklist blacklist.txt";
303306
break;
304307
case 2:
305308
defaultparameters << "-1";
306309
break;
307310
case 3:
308-
defaultparameters << "-1 --dns-addr 1.1.1.1 --dns-port 1253 --dnsv6-addr 2a02:6b8::feed:0ff --dnsv6-port 1253";
311+
defaultparameters << "-1 --dns-addr 1.1.1.1 --dns-port 1253";
309312
break;
310313
case 4:
311-
defaultparameters << "-1 -a -m --dns-addr 1.1.1.1 --dns-port 1253 --dnsv6-addr 2a02:6b8::feed:0ff --dnsv6-port 1253";
314+
defaultparameters << "-1 -a -m --dns-addr 1.1.1.1 --dns-port 1253";
312315
}
313316

314317
//CUSTOMPARAMETERS

src/res.qrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<RCC>
22
<qresource prefix="/">
3-
<file>english.qm</file>
3+
<file>lang_ko.qm</file>
4+
<file>lang_en.qm</file>
45
</qresource>
56
<qresource prefix="/images">
67
<file>images/info-button.png</file>

src/settings.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55

66
Settings::Settings(QWidget *parent) :
77
QWidget(parent),
8+
ui(new Ui::Settings),
89
ayarR(new QSettings("HexOpenSource", "GBDPI-GUI")),
9-
spinDnsPortValue(1253),
10-
lineDnsAddrValue("208.67.220.220"),
11-
spinDnsv6PortValue(1253),
12-
lineDnsv6AddrValue("2a02:6b8::feed:0ff"),
13-
spinEValue(0),
1410
spinFValue(0),
1511
spinKValue(0),
12+
spinEValue(0),
1613
spinPortValue(0),
1714
lineIpIdValue(""),
18-
ui(new Ui::Settings)
15+
lineDnsAddrValue("208.67.220.220"),
16+
spinDnsPortValue(1253),
17+
lineDnsv6AddrValue("2a02:6b8::feed:0ff"),
18+
spinDnsv6PortValue(1253)
1919
{
2020
ui->setupUi(this);
2121
setWindowFlags(Qt::MSWindowsFixedSizeDialogHint);

src/settings.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</sizepolicy>
4242
</property>
4343
<property name="currentIndex">
44-
<number>0</number>
44+
<number>1</number>
4545
</property>
4646
<widget class="QWidget" name="paramTab">
4747
<attribute name="title">
@@ -489,7 +489,7 @@
489489
<string>Sistem Tepsisine Küçült</string>
490490
</property>
491491
<property name="checked">
492-
<bool>true</bool>
492+
<bool>false</bool>
493493
</property>
494494
</widget>
495495
</item>

0 commit comments

Comments
 (0)