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

qt: visual fixes & more

pull/1560/head
user 4 years ago
parent
22124c25d1
commit
4001f48a28
5 changed files with 79 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      qt/i2pd_qt/.gitignore
  2. 2
      qt/i2pd_qt/TunnelPane.cpp
  3. 4
      qt/i2pd_qt/TunnelPane.h
  4. 79
      qt/i2pd_qt/generalsettingswidget.ui
  5. 14
      qt/i2pd_qt/mainwindow.cpp

1
qt/i2pd_qt/.gitignore vendored
Unescape View File

@ -9,4 +9,5 @@ object_script.* @@ -9,4 +9,5 @@ object_script.*
i2pd_qt_plugin_import.cpp
i2pd_qt.pro.autosave*
build*
nohup.out

2
qt/i2pd_qt/TunnelPane.cpp
Unescape View File

@ -31,7 +31,7 @@ void TunnelPane::setupTunnelPane( @@ -31,7 +31,7 @@ void TunnelPane::setupTunnelPane(
this->gridLayoutWidget_2=gridLayoutWidget_2;
tunnelGridLayout = new QVBoxLayout(gridLayoutWidget_2);
tunnelGridLayout->setObjectName(QStringLiteral("tunnelGridLayout"));
tunnelGridLayout->setContentsMargins(5, 5, 5, 5);
tunnelGridLayout->setContentsMargins(10, 25, 10, 10);
tunnelGridLayout->setSpacing(5);
//header

4
qt/i2pd_qt/TunnelPane.h
Unescape View File

@ -165,9 +165,9 @@ private: @@ -165,9 +165,9 @@ private:
i2p_streaming_initialAckDelayLabel->setText(QApplication::translate("tunForm", "Milliseconds to wait before sending Ack:", 0));
i2p_streaming_answerPingsCheckBox->setText(QApplication::translate("tunForm", "Enable sending pongs", 0));
i2cp_leaseSetTypeLabel->setText(QApplication::translate("tunForm", "Type of LeaseSet to be sent. 1, 3 or 5:", 0));
i2cp_leaseSetEncTypeLabel->setText(QApplication::translate("tunForm", "Comma-separated encryption types to be used in LeaseSet type 3 or 5:", 0));
i2cp_leaseSetEncTypeLabel->setText(QApplication::translate("tunForm", "Comma-separ. encr. types to be used in LeaseSet type 3 or 5:", 0));
i2cp_leaseSetPrivKeyLabel->setText(QApplication::translate("tunForm", "Decryption key for encrypted LeaseSet in base64. PSK or private DH:", 0));
i2cp_leaseSetAuthTypeLabel->setText(QApplication::translate("tunForm", "Authentication type for encrypted LeaseSet. 0 - no authentication (default), 1 - DH, 2 - PSK:", 0));
i2cp_leaseSetAuthTypeLabel->setText(QApplication::translate("tunForm", "Auth type for encrypted LeaseSet. 0 - no auth, 1 - DH, 2 - PSK:", 0));
}
};

79
qt/i2pd_qt/generalsettingswidget.ui
Unescape View File

@ -19,13 +19,28 @@ @@ -19,13 +19,28 @@
<property name="windowTitle">
<string>GeneralSettingsContentsForm</string>
</property>
<property name="styleSheet">
<string notr="true">QGroupBox {
font: bold;
border: 1px solid silver;
border-radius: 6px;
margin-top: 6px;
}
QGroupBox::title {
subcontrol-origin: margin;
left: 7px;
padding: 0px 5px 0px 5px;
}
</string>
</property>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>679</width>
<height>4178</height>
<height>4242</height>
</rect>
</property>
<layout class="QVBoxLayout" name="settingsContentsQVBoxLayout">
@ -59,7 +74,7 @@ @@ -59,7 +74,7 @@
<item>
<widget class="QGroupBox" name="configFIleGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -67,18 +82,36 @@ @@ -67,18 +82,36 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>51</height>
<height>60</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>51</height>
<height>60</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QGroupBox {
font: bold;
border: 1px solid silver;
border-radius: 6px;
margin-top: 6px;
}
QGroupBox::title {
subcontrol-origin: margin;
left: 7px;
padding: 0px 5px 0px 5px;
}
</string>
</property>
<property name="title">
<string>Configuration file:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<widget class="QWidget" name="horizontalLayoutWidget_conf1">
<property name="geometry">
<rect>
@ -90,7 +123,7 @@ @@ -90,7 +123,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_conf">
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
<enum>QLayout::SetMinAndMaxSize</enum>
</property>
<item>
<widget class="QLineEdit" name="configFileLineEdit"/>
@ -100,19 +133,19 @@ @@ -100,19 +133,19 @@
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
<verstretch>25</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>27</height>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>27</height>
<height>25</height>
</size>
</property>
<property name="text">
@ -309,13 +342,13 @@ @@ -309,13 +342,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>112</height>
<height>130</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>112</height>
<height>130</height>
</size>
</property>
<property name="title">
@ -2329,13 +2362,13 @@ Comma separated list of base64 identities:</string> @@ -2329,13 +2362,13 @@ Comma separated list of base64 identities:</string>
<property name="minimumSize">
<size>
<width>0</width>
<height>215</height>
<height>225</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>215</height>
<height>225</height>
</size>
</property>
<property name="title">
@ -3341,7 +3374,7 @@ Comma separated list of base64 identities:</string> @@ -3341,7 +3374,7 @@ Comma separated list of base64 identities:</string>
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -3349,13 +3382,13 @@ Comma separated list of base64 identities:</string> @@ -3349,13 +3382,13 @@ Comma separated list of base64 identities:</string>
<property name="minimumSize">
<size>
<width>0</width>
<height>128</height>
<height>145</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>128</height>
<height>300</height>
</size>
</property>
<property name="title">
@ -3370,12 +3403,24 @@ Comma separated list of base64 identities:</string> @@ -3370,12 +3403,24 @@ Comma separated list of base64 identities:</string>
<x>-1</x>
<y>19</y>
<width>681</width>
<height>101</height>
<height>124</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetMinAndMaxSize</enum>
<enum>QLayout::SetDefaultConstraint</enum>
</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>
<widget class="QCheckBox" name="checkBoxWebsocketsEnable">

14
qt/i2pd_qt/mainwindow.cpp
Unescape View File

@ -84,7 +84,7 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren @@ -84,7 +84,7 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
ui->settingsScrollArea->resize(uiSettings->settingsContentsQVBoxLayout->sizeHint().width()+10,380);
//QScrollBar* const barSett = ui->settingsScrollArea->verticalScrollBar();
int w = 683;
int h = 4000;
int h = 4250;
ui->settingsContents->setFixedSize(w, h);
ui->settingsContents->setGeometry(QRect(0,0,w,h));
@ -324,6 +324,18 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren @@ -324,6 +324,18 @@ MainWindow::MainWindow(std::shared_ptr<std::iostream> logStream_, QWidget *paren
ui->tunnelsScrollAreaWidgetContents->setGeometry(QRect(0, 0, 621, 451));
ui->tunnelsScrollAreaWidgetContents->setStyleSheet("QGroupBox { " \
" font: bold;" \
" border: 1px solid silver;" \
" border-radius: 6px;" \
" margin-top: 6px;" \
"}" \
"QGroupBox::title {" \
" subcontrol-origin: margin;" \
" left: 7px;" \
" padding: 0px 5px 0px 5px;" \
"}");
appendTunnelForms("");
uiSettings->configFileLineEdit->setEnabled(false);

Write Preview
Loading…
Cancel
Save