PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge pull request #1562 from nonlinear-chaos-order-etc-etal/openssl 

qt: socks outproxy enabled checkbox added; visual fixes; socks defaults fixes
pull/1564/head
orignal 4 years ago committed by GitHub
parent
fbfc5ecda3 9c225f8d77
commit
cb55944ff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 515 additions and 507 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 357
      qt/i2pd_qt/generalsettingswidget.ui
  2. 7
      qt/i2pd_qt/mainwindow.cpp

357
qt/i2pd_qt/generalsettingswidget.ui
Unescape View File

@ -40,7 +40,7 @@ QGroupBox::title {
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>679</width> <width>679</width>
<height>4242</height> <height>4434</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="settingsContentsQVBoxLayout"> <layout class="QVBoxLayout" name="settingsContentsQVBoxLayout">
@ -82,13 +82,13 @@ QGroupBox::title {
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>60</height> <height>80</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>60</height> <height>80</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -112,19 +112,33 @@ QGroupBox::title {
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<widget class="QWidget" name="horizontalLayoutWidget_conf1"> <widget class="QWidget" name="verticalLayoutWidget_7">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>12</x>
<y>18</y> <y>19</y>
<width>661</width> <width>651</width>
<height>31</height> <height>51</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_conf"> <layout class="QHBoxLayout" name="horizontalLayout_conf">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetMinAndMaxSize</enum> <enum>QLayout::SetMinAndMaxSize</enum>
</property> </property>
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item> <item>
<widget class="QLineEdit" name="configFileLineEdit"/> <widget class="QLineEdit" name="configFileLineEdit"/>
</item> </item>
@ -133,7 +147,7 @@ QGroupBox::title {
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>25</verstretch> <verstretch>27</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@ -145,7 +159,7 @@ QGroupBox::title {
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>25</height> <height>27</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
@ -154,6 +168,8 @@ QGroupBox::title {
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>
@ -162,27 +178,41 @@ QGroupBox::title {
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>51</height> <height>80</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>51</height> <height>80</height>
</size> </size>
</property> </property>
<property name="title"> <property name="title">
<string>Data folder (for storage of i2pd data — RI, keys, peer profiles, …):</string> <string>Data folder (for storage of i2pd data — RI, keys, peer profiles, …):</string>
</property> </property>
<widget class="QWidget" name="horizontalLayoutWidget_7"> <widget class="QWidget" name="verticalLayoutWidget_12">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>12</x>
<y>20</y> <y>19</y>
<width>661</width> <width>651</width>
<height>31</height> <height>51</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_12">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum> <enum>QLayout::SetMaximumSize</enum>
@ -198,6 +228,8 @@ QGroupBox::title {
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>
@ -212,27 +244,41 @@ QGroupBox::title {
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>51</height> <height>80</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>51</height> <height>80</height>
</size> </size>
</property> </property>
<property name="title"> <property name="title">
<string>Pid file:</string> <string>Pid file:</string>
</property> </property>
<widget class="QWidget" name="horizontalLayoutWidget_pid3"> <widget class="QWidget" name="verticalLayoutWidget_13">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>12</x>
<y>18</y> <y>19</y>
<width>661</width> <width>651</width>
<height>31</height> <height>51</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_pid"> <layout class="QHBoxLayout" name="horizontalLayout_pid">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum> <enum>QLayout::SetMaximumSize</enum>
@ -266,6 +312,8 @@ QGroupBox::title {
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>
@ -280,27 +328,41 @@ QGroupBox::title {
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>51</height> <height>80</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>51</height> <height>80</height>
</size> </size>
</property> </property>
<property name="title"> <property name="title">
<string>Tunnels configuration file:</string> <string>Tunnels configuration file:</string>
</property> </property>
<widget class="QWidget" name="horizontalLayoutWidget_3"> <widget class="QWidget" name="verticalLayoutWidget_14">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>12</x>
<y>18</y> <y>19</y>
<width>661</width> <width>651</width>
<height>31</height> <height>51</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_14">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_tun"> <layout class="QHBoxLayout" name="horizontalLayout_tun">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum> <enum>QLayout::SetMaximumSize</enum>
@ -334,6 +396,8 @@ QGroupBox::title {
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>
@ -2885,40 +2949,48 @@ Comma separated list of base64 identities:</string>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>405</height> <height>500</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>405</height> <height>500</height>
</size> </size>
</property> </property>
<property name="title"> <property name="title">
<string>Socks proxy</string> <string>Socks proxy</string>
</property> </property>
<widget class="QCheckBox" name="socksProxyEnabledCheckBox"> <widget class="QWidget" name="verticalLayoutWidget_8">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>9</x>
<y>20</y> <y>20</y>
<width>97</width> <width>661</width>
<height>22</height> <height>470</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<widget class="QCheckBox" name="socksProxyEnabledCheckBox">
<property name="text"> <property name="text">
<string>Enabled</string> <string>Enabled</string>
</property> </property>
</widget> </widget>
<widget class="QWidget" name="socks_horizontalLayoutWidget_17_"> </item>
<property name="geometry"> <item>
<rect>
<x>0</x>
<y>40</y>
<width>661</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="socks_horizontalLayout_17_"> <layout class="QHBoxLayout" name="socks_horizontalLayout_17_">
<item> <item>
<widget class="QLabel" name="socks_label_11"> <widget class="QLabel" name="socks_label_11">
@ -2944,16 +3016,8 @@ Comma separated list of base64 identities:</string>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
<widget class="QWidget" name="socks_horizontalLayoutWidget_18"> <item>
<property name="geometry">
<rect>
<x>0</x>
<y>70</y>
<width>661</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="socks_horizontalLayout_18"> <layout class="QHBoxLayout" name="socks_horizontalLayout_18">
<item> <item>
<widget class="QLabel" name="socks_label_12"> <widget class="QLabel" name="socks_label_12">
@ -2986,16 +3050,8 @@ Comma separated list of base64 identities:</string>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
<widget class="QWidget" name="socks_horizontalLayoutWidget_19"> <item>
<property name="geometry">
<rect>
<x>0</x>
<y>100</y>
<width>661</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="socks_horizontalLayout_19"> <layout class="QHBoxLayout" name="socks_horizontalLayout_19">
<item> <item>
<widget class="QLabel" name="socks_label_17"> <widget class="QLabel" name="socks_label_17">
@ -3015,16 +3071,42 @@ Comma separated list of base64 identities:</string>
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_40">
<item>
<widget class="QLabel" name="label_42">
<property name="text">
<string>Signature type:</string>
</property>
</widget> </widget>
<widget class="QWidget" name="socks_horizontalLayoutWidget_20"> </item>
<property name="geometry"> <item>
<rect> <widget class="QComboBox" name="comboBox_socksProxySignatureType"/>
<x>0</x> </item>
<y>160</y> <item>
<width>661</width> <widget class="QPushButton" name="socksProxySignTypeComboEditPushButton">
<height>31</height> <property name="text">
</rect> <string>Edit</string>
</property> </property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_28">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="socks_horizontalLayout_20"> <layout class="QHBoxLayout" name="socks_horizontalLayout_20">
<item> <item>
<widget class="QLabel" name="socks_label_18"> <widget class="QLabel" name="socks_label_18">
@ -3057,16 +3139,8 @@ Comma separated list of base64 identities:</string>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
<widget class="QWidget" name="socks_horizontalLayoutWidget_21"> <item>
<property name="geometry">
<rect>
<x>0</x>
<y>190</y>
<width>661</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="socks_horizontalLayout_21"> <layout class="QHBoxLayout" name="socks_horizontalLayout_21">
<item> <item>
<widget class="QLabel" name="socks_label_19"> <widget class="QLabel" name="socks_label_19">
@ -3099,16 +3173,8 @@ Comma separated list of base64 identities:</string>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
<widget class="QWidget" name="socks_horizontalLayoutWidget_22"> <item>
<property name="geometry">
<rect>
<x>0</x>
<y>220</y>
<width>661</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="socks_horizontalLayout_22"> <layout class="QHBoxLayout" name="socks_horizontalLayout_22">
<item> <item>
<widget class="QLabel" name="socks_label_20"> <widget class="QLabel" name="socks_label_20">
@ -3141,16 +3207,8 @@ Comma separated list of base64 identities:</string>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
<widget class="QWidget" name="socks_horizontalLayoutWidget_23"> <item>
<property name="geometry">
<rect>
<x>0</x>
<y>250</y>
<width>661</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="socks_horizontalLayout_23"> <layout class="QHBoxLayout" name="socks_horizontalLayout_23">
<item> <item>
<widget class="QLabel" name="socks_label_21"> <widget class="QLabel" name="socks_label_21">
@ -3183,16 +3241,25 @@ Comma separated list of base64 identities:</string>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
<widget class="QWidget" name="horizontalLayoutWidget_5"> <item>
<property name="geometry"> <layout class="QHBoxLayout" name="horizontalLayout_56">
<rect> <property name="topMargin">
<x>0</x> <number>0</number>
<y>280</y> </property>
<width>661</width> <property name="bottomMargin">
<height>31</height> <number>0</number>
</rect>
</property> </property>
<item>
<widget class="QCheckBox" name="socksOutproxyEnabledCheckBox">
<property name="text">
<string>Outproxy enabled</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_12"> <layout class="QHBoxLayout" name="horizontalLayout_12">
<item> <item>
<widget class="QLabel" name="label_22"> <widget class="QLabel" name="label_22">
@ -3218,16 +3285,8 @@ Comma separated list of base64 identities:</string>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
<widget class="QWidget" name="horizontalLayoutWidget_6"> <item>
<property name="geometry">
<rect>
<x>0</x>
<y>310</y>
<width>661</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_24"> <layout class="QHBoxLayout" name="horizontalLayout_24">
<item> <item>
<widget class="QLabel" name="label_23"> <widget class="QLabel" name="label_23">
@ -3260,59 +3319,7 @@ Comma separated list of base64 identities:</string>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget_34">
<property name="geometry">
<rect>
<x>0</x>
<y>130</y>
<width>661</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_40">
<item>
<widget class="QLabel" name="label_42">
<property name="text">
<string>Signature type:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_socksProxySignatureType"/>
</item> </item>
<item>
<widget class="QPushButton" name="socksProxySignTypeComboEditPushButton">
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_28">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="verticalLayoutWidget_7">
<property name="geometry">
<rect>
<x>-1</x>
<y>340</y>
<width>661</width>
<height>62</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_57"> <layout class="QHBoxLayout" name="horizontalLayout_57">
<item> <item>

7
qt/i2pd_qt/mainwindow.cpp
Unescape View File

@ -84,7 +84,7 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
ui->settingsScrollArea->resize(uiSettings->settingsContentsQVBoxLayout->sizeHint().width()+10,380); ui->settingsScrollArea->resize(uiSettings->settingsContentsQVBoxLayout->sizeHint().width()+10,380);
//QScrollBar* const barSett = ui->settingsScrollArea->verticalScrollBar(); //QScrollBar* const barSett = ui->settingsScrollArea->verticalScrollBar();
int w = 683; int w = 683;
int h = 4250; int h = 4550;
ui->settingsContents->setFixedSize(w, h); ui->settingsContents->setFixedSize(w, h);
ui->settingsContents->setGeometry(QRect(0,0,w,h)); ui->settingsContents->setGeometry(QRect(0,0,w,h));
@ -232,8 +232,9 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
initStringBox( OPTION("socksproxy","inbound.quantity",[]{return "";}), uiSettings->socksProxyInboundTunnQuantityLineEdit); initStringBox( OPTION("socksproxy","inbound.quantity",[]{return "";}), uiSettings->socksProxyInboundTunnQuantityLineEdit);
initStringBox( OPTION("socksproxy","outbound.length",[]{return "";}), uiSettings->socksProxyOutBoundTunnLenLineEdit); initStringBox( OPTION("socksproxy","outbound.length",[]{return "";}), uiSettings->socksProxyOutBoundTunnLenLineEdit);
initStringBox( OPTION("socksproxy","outbound.quantity",[]{return "";}), uiSettings->socksProxyOutboundTunnQuantityLineEdit); initStringBox( OPTION("socksproxy","outbound.quantity",[]{return "";}), uiSettings->socksProxyOutboundTunnQuantityLineEdit);
initIPAddressBox( OPTION("socksproxy","outproxy",[]{return "";}), uiSettings->outproxyAddressLineEdit, tr("Socks proxy -> Outproxy address")); initCheckBox( OPTION("socksproxy","outproxy.enabled",[]{return "false";}), uiSettings->socksOutproxyEnabledCheckBox);
initTCPPortBox( OPTION("socksproxy","outproxyport",[]{return "";}), uiSettings->outproxyPortLineEdit, tr("Socks proxy -> Outproxy port")); initIPAddressBox( OPTION("socksproxy","outproxy",[]{return "127.0.0.1";}), uiSettings->outproxyAddressLineEdit, tr("Socks proxy -> Outproxy address"));
initTCPPortBox( OPTION("socksproxy","outproxyport",[]{return "9050";}), uiSettings->outproxyPortLineEdit, tr("Socks proxy -> Outproxy port"));
initStringBox( OPTION("socksproxy","i2cp.leaseSetType",[]{return "1";}), uiSettings->socksProxyI2cpLeaseSetTypeLineEdit);//Type of LeaseSet to be sent. 1, 3 or 5. 1 by default initStringBox( OPTION("socksproxy","i2cp.leaseSetType",[]{return "1";}), uiSettings->socksProxyI2cpLeaseSetTypeLineEdit);//Type of LeaseSet to be sent. 1, 3 or 5. 1 by default
initStringBox( OPTION("socksproxy","i2cp.leaseSetEncType",[]{return "";}), uiSettings->socksProxyI2cpLeaseSetEncTypeLineEdit);//Comma separated encryption types to be used in LeaseSet type 3 or 5 initStringBox( OPTION("socksproxy","i2cp.leaseSetEncType",[]{return "";}), uiSettings->socksProxyI2cpLeaseSetEncTypeLineEdit);//Comma separated encryption types to be used in LeaseSet type 3 or 5

Write Preview
Loading…
Cancel
Save