Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
arm64v8a
2023-01-22 17:20:32 +09:00
parent 5e22651647
commit 8fa966aba4
3 changed files with 108 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ui/edit/edit_custom.cpp
View File

@@ -81,10 +81,8 @@ void EditCustom::onStart(QSharedPointer<NekoRay::ProxyEntity> _ent) {
if (preset_core == "internal") { if (preset_core == "internal") {
ui->core->hide(); ui->core->hide();
ui->core_l->setText(tr("Outbound JSON, please read the documentation.")); ui->core_l->setText(tr("Outbound JSON, please read the documentation."));
ui->command->hide(); ui->w_ext1->hide();
ui->command_l->hide(); ui->w_ext2->hide();
ui->config_suffix->hide();
ui->config_suffix_l->hide();
} }
// Preview // Preview

178
ui/edit/edit_custom.ui
View File

@@ -46,88 +46,116 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="QWidget" name="w_ext1" native="true">
<item> <layout class="QHBoxLayout" name="horizontalLayout_2">
<widget class="QLabel" name="command_l"> <property name="leftMargin">
<property name="text"> <number>0</number>
<string>Command</string> </property>
</property> <property name="topMargin">
</widget> <number>0</number>
</item> </property>
<item> <property name="rightMargin">
<widget class="QLineEdit" name="command"> <number>0</number>
<property name="placeholderText"> </property>
<string notr="true">%config%</string> <property name="bottomMargin">
</property> <number>0</number>
</widget> </property>
</item> <item>
<item> <widget class="QLabel" name="command_l">
<widget class="QLabel" name="config_suffix_l">
<property name="text">
<string>Config Suffix</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="config_suffix">
<property name="editable">
<bool>true</bool>
</property>
<item>
<property name="text"> <property name="text">
<string notr="true"/> <string>Command</string>
</property> </property>
</item> </widget>
<item> </item>
<item>
<widget class="QLineEdit" name="command">
<property name="placeholderText">
<string notr="true">%config%</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="config_suffix_l">
<property name="text"> <property name="text">
<string notr="true">json</string> <string>Config Suffix</string>
</property> </property>
</item> </widget>
<item> </item>
<property name="text"> <item>
<string notr="true">yml</string> <widget class="QComboBox" name="config_suffix">
<property name="editable">
<bool>true</bool>
</property> </property>
</item> <item>
</widget> <property name="text">
</item> <string notr="true"/>
</layout> </property>
</item>
<item>
<property name="text">
<string notr="true">json</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">yml</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="QWidget" name="w_ext2" native="true">
<item> <layout class="QHBoxLayout" name="horizontalLayout_3">
<widget class="QLabel" name="label"> <property name="leftMargin">
<property name="toolTip"> <number>0</number>
<string>Random if it's empty or zero.</string> </property>
</property> <property name="topMargin">
<property name="text"> <number>0</number>
<string notr="true">Mapping Port</string> </property>
</property> <property name="rightMargin">
</widget> <number>0</number>
</item> </property>
<item> <property name="bottomMargin">
<widget class="QLineEdit" name="mapping_port"/> <number>0</number>
</item> </property>
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label">
<property name="toolTip"> <property name="toolTip">
<string>Random if it's empty or zero.</string> <string>Random if it's empty or zero.</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">Socks Port</string> <string notr="true">Mapping Port</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="socks_port"/> <widget class="QLineEdit" name="mapping_port"/>
</item> </item>
<item> <item>
<widget class="QPushButton" name="preview"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="toolTip">
<string>Preview</string> <string>Random if it's empty or zero.</string>
</property> </property>
</widget> <property name="text">
</item> <string notr="true">Socks Port</string>
</layout> </property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="socks_port"/>
</item>
<item>
<widget class="QPushButton" name="preview">
<property name="text">
<string>Preview</string>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="config_simple"> <widget class="QTextEdit" name="config_simple">

4
ui/mainwindow.cpp
View File

@@ -1340,7 +1340,9 @@ void MainWindow::show_log_impl(const QString &log) {
} }
} }
#define ADD_TO_CURRENT_ROUTE(a, b) NekoRay::dataStore->routing->a = (SplitLines(NekoRay::dataStore->routing->a) << (b)).join("\n"); #define ADD_TO_CURRENT_ROUTE(a, b) \
NekoRay::dataStore->routing->a = (SplitLines(NekoRay::dataStore->routing->a) << (b)).join("\n"); \
NekoRay::dataStore->routing->Save();
void MainWindow::on_masterLogBrowser_customContextMenuRequested(const QPoint &pos) { void MainWindow::on_masterLogBrowser_customContextMenuRequested(const QPoint &pos) {
QMenu *menu = ui->masterLogBrowser->createStandardContextMenu(); QMenu *menu = ui->masterLogBrowser->createStandardContextMenu();