diff --git a/sources/gui/src/bridgewidget.ui b/sources/gui/src/bridgewidget.ui index d0265cb..25dfcdf 100644 --- a/sources/gui/src/bridgewidget.ui +++ b/sources/gui/src/bridgewidget.ui @@ -6,7 +6,7 @@ 0 0 - 424 + 550 76 @@ -25,14 +25,34 @@ - - - Skip (R)STP and immediately activate all bridge members - - - Skip forwarding delay - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Skip (R)STP and immediately activate all bridge members + + + Skip forwarding delay + + + + diff --git a/sources/gui/src/ethernetwidget.ui b/sources/gui/src/ethernetwidget.ui index 4fa5f08..10beec6 100644 --- a/sources/gui/src/ethernetwidget.ui +++ b/sources/gui/src/ethernetwidget.ui @@ -6,8 +6,8 @@ 0 0 - 431 - 296 + 550 + 275 @@ -27,26 +27,23 @@ - + Qt::Horizontal - - - 40 - 20 - - - + - - - Hide advanced - + true + + true + + + Qt::DownArrow + @@ -55,27 +52,67 @@ - - - <html><head/><body><p>Whether or not the absence of a carrier is acceptable</p></body></html> - - - Skip no carrier - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + <html><head/><body><p>Whether or not the absence of a carrier is acceptable</p></body></html> + + + Skip no carrier + + + + - - - Set to ‘yes’ to use 802.1x authentication - - - 802.1x authentication - - - true - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Set to ‘yes’ to use 802.1x authentication + + + 802.1x authentication + + + true + + + + @@ -84,19 +121,28 @@ - - - 150 - 0 - + + + 7 + 0 + WPA config file + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + Path to a wpa_supplicant configuration file @@ -104,6 +150,12 @@ + + + 4 + 0 + + Browse @@ -115,19 +167,28 @@ - - - 150 - 0 - + + + 7 + 0 + WPA driver + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 14 + 0 + + The wpa_supplicant driver to use for 802.1x authentication @@ -157,19 +218,28 @@ - - - 150 - 0 - + + + 1 + 0 + Timeout carrier + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Maximum time, in seconds, to wait for a carrier @@ -187,19 +257,28 @@ - - - 150 - 0 - + + + 1 + 0 + Timeout WPA + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Maximum time, in seconds, to wait for 802.1x authentication to succeed @@ -223,9 +302,6 @@ - pushButton_ethernetAdvanced - checkBox_skip - checkBox_8021x lineEdit_wpaConfig pushButton_wpaConfig comboBox_driver diff --git a/sources/gui/src/generalwidget.ui b/sources/gui/src/generalwidget.ui index 0bda687..36d6262 100644 --- a/sources/gui/src/generalwidget.ui +++ b/sources/gui/src/generalwidget.ui @@ -6,8 +6,8 @@ 0 0 - 425 - 531 + 550 + 492 @@ -16,6 +16,12 @@ + + + 2 + 0 + + QDockWidget::NoDockWidgetFeatures @@ -28,21 +34,30 @@ - - - 150 - 0 - + + + 1 + 0 + Description + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + - <html><head/><body><p>A description of the profile</p></body></html> + A description of the profile @@ -52,19 +67,28 @@ - - - 150 - 0 - + + + 1 + 0 + Connection + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The connection type used by the profile @@ -136,19 +160,28 @@ - - - 150 - 0 - + + + 1 + 0 + Interface + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The name of the associated network interface @@ -165,18 +198,27 @@ + + + 7 + 0 + + Binds to interfaces + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - 150 - 0 - + + + 10 + 0 + true @@ -185,6 +227,12 @@ + + + 4 + 0 + + Add @@ -210,26 +258,23 @@ - + Qt::Horizontal - - - 40 - 20 - - - + - - - Hide advanced - + true + + true + + + Qt::DownArrow + @@ -243,18 +288,27 @@ + + + 7 + 0 + + After + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - 150 - 0 - + + + 10 + 0 + true @@ -263,6 +317,12 @@ + + + 4 + 0 + + Add @@ -289,19 +349,28 @@ - - - 150 - 0 - + + + 7 + 0 + Command after starting + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 14 + 0 + + A command that is executed after a connection is established @@ -313,19 +382,28 @@ - - - 150 - 0 - + + + 7 + 0 + Command before stoping + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 14 + 0 + + A command that is executed before a connection is brought down @@ -334,21 +412,61 @@ - - - Set to ‘yes’ to force connecting even if the interface is up - - - Force connect - - + + + + + + 7 + 0 + + + + + + + + + 14 + 0 + + + + Set to ‘yes’ to force connecting even if the interface is up + + + Force connect + + + + - - - Debug mode - - + + + + + + 7 + 0 + + + + + + + + + 14 + 0 + + + + Debug mode + + + + diff --git a/sources/gui/src/ipwidget.ui b/sources/gui/src/ipwidget.ui index ab1ce6f..758e5f6 100644 --- a/sources/gui/src/ipwidget.ui +++ b/sources/gui/src/ipwidget.ui @@ -6,8 +6,8 @@ 0 0 - 430 - 1353 + 550 + 1286 @@ -28,12 +28,21 @@ + + + 1 + 0 + + 150 0 + + Qt::RightToLeft + IP @@ -44,6 +53,12 @@ + + + 2 + 0 + + dhcp @@ -67,22 +82,38 @@ - - - 150 - 0 - + + + 7 + 0 + Address + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + + + + 4 + 0 + + Add @@ -109,19 +140,28 @@ - - - 150 - 0 - + + + 1 + 0 + Gateway + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + An IP routing gateway address @@ -136,11 +176,14 @@ - - - 150 - 0 - + + + 1 + 0 + + + + Qt::RightToLeft IP6 @@ -152,6 +195,12 @@ + + + 2 + 0 + + dhcp @@ -185,22 +234,38 @@ - - - 150 - 0 - + + + 7 + 0 + Address6 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + + + + 4 + 0 + + Add @@ -227,19 +292,28 @@ - - - 150 - 0 - + + + 1 + 0 + Gateway6 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + An IPv6 routing gateway address @@ -253,26 +327,23 @@ - + Qt::Horizontal - - - 40 - 20 - - - + - - - Hide advanced - + true + + true + + + Qt::DownArrow + @@ -287,58 +358,68 @@ - - - 150 - 0 - + + + 1 + 0 + Routes + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 2 + 0 + + + - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 68 - 20 - - - - - - - 75 - 0 - + + + 7 + 0 + via + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + + + + 4 + 0 + + Add @@ -369,58 +450,68 @@ - - - 150 - 0 - + + + 1 + 0 + Routes6 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 2 + 0 + + + - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 68 - 20 - - - - - - - 75 - 0 - + + + 7 + 0 + via + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + + + + 4 + 0 + + Add @@ -450,22 +541,38 @@ - - - 150 - 0 - + + + 7 + 0 + Custom + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + + + + 4 + 0 + + Add @@ -492,13 +599,28 @@ + + + 1 + 0 + + Hostname + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + A system hostname @@ -510,19 +632,28 @@ - - - 150 - 0 - + + + 1 + 0 + Timeout DAD + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Maximum time, in seconds, to wait for IPv6’s Duplicate Address Detection to succeed @@ -546,19 +677,28 @@ - - - 150 - 0 - + + + 1 + 0 + DHCP client + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The name of the preferred DHCP client @@ -581,19 +721,28 @@ - - - 150 - 0 - + + + 1 + 0 + dhcpcd options + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Additional options to be passed to the DHCP client @@ -609,19 +758,28 @@ - - - 150 - 0 - + + + 1 + 0 + dhclient options + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Additional options to be passed to the DHCP client @@ -633,19 +791,28 @@ - - - 150 - 0 - + + + 1 + 0 + dhclient options (6) + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Additional options to be passed to the DHCP client @@ -660,19 +827,28 @@ - - - 150 - 0 - + + + 1 + 0 + Timeout DHCP + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Maximum time, in seconds, to wait for DHCP to be successful @@ -690,14 +866,34 @@ - - - Set to ‘yes’ to release the DHCP lease when the profile is stopped - - - DHCP release on stop - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Set to ‘yes’ to release the DHCP lease when the profile is stopped + + + DHCP release on stop + + + + @@ -711,22 +907,38 @@ - - - 150 - 0 - + + + 7 + 0 + DNS + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + + + + 4 + 0 + + Add @@ -753,19 +965,28 @@ - - - 150 - 0 - + + + 1 + 0 + DNS domain + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + A ‘domain’ line for /etc/resolv.conf @@ -777,19 +998,28 @@ - - - 150 - 0 - + + + 1 + 0 + DNS search + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + A ‘search’ line for /etc/resolv.conf @@ -803,22 +1033,38 @@ - - - 150 - 0 - + + + 7 + 0 + DNS options + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + + + + 4 + 0 + + Add @@ -866,7 +1112,6 @@ pushButton_ipAddress6 listWidget_ipAddress6 lineEdit_gateway6 - pushButton_ipAdvanced lineEdit_ipRoutes lineEdit_ipRoutes2 pushButton_ipRoutes @@ -885,7 +1130,6 @@ lineEdit_dhclientOpt lineEdit_dhclientOpt6 spinBox_timeoutDhcp - checkBox_dhcp lineEdit_dns pushButton_dns listWidget_dns diff --git a/sources/gui/src/macvlanwidget.ui b/sources/gui/src/macvlanwidget.ui index e805a0d..4aa9749 100644 --- a/sources/gui/src/macvlanwidget.ui +++ b/sources/gui/src/macvlanwidget.ui @@ -7,7 +7,7 @@ 0 0 396 - 101 + 103 @@ -28,13 +28,28 @@ + + + 1 + 0 + + Mode + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + bridge @@ -63,19 +78,28 @@ - - - 150 - 0 - + + + 1 + 0 + MAC address + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Optional static MAC address diff --git a/sources/gui/src/mainwindow.ui b/sources/gui/src/mainwindow.ui index 1230335..d93ca43 100644 --- a/sources/gui/src/mainwindow.ui +++ b/sources/gui/src/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 469 + 550 497 @@ -157,19 +157,28 @@ - - - 150 - 0 - + + + 1 + 0 + Profile + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + true @@ -190,7 +199,7 @@ 0 0 - 437 + 518 368 diff --git a/sources/gui/src/mobilewidget.ui b/sources/gui/src/mobilewidget.ui index 43cd14c..19af3b6 100644 --- a/sources/gui/src/mobilewidget.ui +++ b/sources/gui/src/mobilewidget.ui @@ -7,7 +7,7 @@ 0 0 445 - 370 + 350 @@ -28,19 +28,28 @@ - - - 150 - 0 - + + + 1 + 0 + Username + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The username and password to connect with @@ -52,22 +61,34 @@ - - - 150 - 0 - + + + 1 + 0 + Password + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The username and password to connect with + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -76,22 +97,34 @@ - - - 150 - 0 - + + + 1 + 0 + Access point name + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The access point (apn) to connect on + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -100,19 +133,28 @@ - - - 150 - 0 - + + + 1 + 0 + PIN + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + If your modem requires a PIN to unlock, use this option @@ -124,19 +166,28 @@ - - - 150 - 0 - + + + 1 + 0 + Mode + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + This option is used to specify the connection mode @@ -172,26 +223,23 @@ - + Qt::Horizontal - - - 40 - 20 - - - + - - - Show advanced - + true + + true + + + Qt::DownArrow + @@ -199,23 +247,98 @@ + + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Use the default route provided by the peer + + + Default route + + + true + + + + + + + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Use the DNS provided by the peer + + + Use peer DNS + + + true + + + + + - - - 150 - 0 - + + + 1 + 0 + Max fail + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The number of consecutive failed connection attempts to tolerate @@ -229,49 +352,32 @@ - - - - Use the default route provided by the peer - - - Default route - - - true - - - - - - - Use the DNS provided by the peer - - - Use peer DNS - - - true - - - - - - 150 - 0 - + + + 7 + 0 + Options file + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + A file to read additional pppd options from @@ -279,6 +385,12 @@ + + + 4 + 0 + + Browse @@ -301,10 +413,7 @@ lineEdit_apn lineEdit_pin comboBox_mode - pushButton_mobileAdvanced spinBox_fail - checkBox_route - checkBox_dns lineEdit_options pushButton_options diff --git a/sources/gui/src/netctlautowindow.ui b/sources/gui/src/netctlautowindow.ui index 94d6cfd..b577ae5 100644 --- a/sources/gui/src/netctlautowindow.ui +++ b/sources/gui/src/netctlautowindow.ui @@ -17,9 +17,6 @@ - - - Qt::AlignCenter @@ -101,7 +98,9 @@ Enable - + + + diff --git a/sources/gui/src/passwdwidget.cpp b/sources/gui/src/passwdwidget.cpp index 33345c7..c989b40 100644 --- a/sources/gui/src/passwdwidget.cpp +++ b/sources/gui/src/passwdwidget.cpp @@ -49,6 +49,7 @@ void PasswdWidget::keyPressEvent(QKeyEvent *pressedKey) void PasswdWidget::createActions() { + connect(ui->checkBox_showSymbols, SIGNAL(stateChanged(int)), this, SLOT(setEchoMode(int))); connect(ui->lineEdit, SIGNAL(returnPressed()), this, SLOT(passwdApply())); connect(ui->buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked(bool)), this, SLOT(cancel())); connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(passwdApply())); @@ -64,12 +65,14 @@ void PasswdWidget::setFocusToLineEdit() void PasswdWidget::setPassword(const bool mode) { if (mode) { - ui->lineEdit->setEchoMode(QLineEdit::Password); + ui->checkBox_showSymbols->setCheckState(Qt::Checked); + setEchoMode(ui->checkBox_showSymbols->checkState()); ui->label->setText(QApplication::translate("PasswdWidget", "Password")); } else { ui->lineEdit->setEchoMode(QLineEdit::Normal); ui->label->setText(QApplication::translate("PasswdWidget", "ESSID")); } + passwdMode = mode; } @@ -84,8 +87,17 @@ void PasswdWidget::cancel() void PasswdWidget::passwdApply() { hide(); - if (ui->lineEdit->echoMode() == QLineEdit::Normal) - return parent->setHiddenName(ui->lineEdit->text()); - else + if (passwdMode) return parent->connectToUnknownEssid(ui->lineEdit->text()); + else + return parent->setHiddenName(ui->lineEdit->text()); +} + + +void PasswdWidget::setEchoMode(const int mode) +{ + if (mode == 0) + ui->lineEdit->setEchoMode(QLineEdit::Normal); + else + ui->lineEdit->setEchoMode(QLineEdit::Password); } diff --git a/sources/gui/src/passwdwidget.h b/sources/gui/src/passwdwidget.h index ea52bdf..df49c3f 100644 --- a/sources/gui/src/passwdwidget.h +++ b/sources/gui/src/passwdwidget.h @@ -44,6 +44,7 @@ public slots: private slots: void cancel(); void passwdApply(); + void setEchoMode(const int mode); private: MainWindow *parent; @@ -51,6 +52,7 @@ private: // ESC pressed event void keyPressEvent(QKeyEvent *pressedKey); void createActions(); + bool passwdMode = true; }; diff --git a/sources/gui/src/passwdwidget.ui b/sources/gui/src/passwdwidget.ui index d1ecb97..5a597c6 100644 --- a/sources/gui/src/passwdwidget.ui +++ b/sources/gui/src/passwdwidget.ui @@ -7,7 +7,7 @@ 0 0 264 - 86 + 109 @@ -37,13 +37,28 @@ + + + 1 + 0 + + Password + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + QLineEdit::Password @@ -51,6 +66,36 @@ + + + + + + + 1 + 0 + + + + + + + + + + + + 2 + 0 + + + + Show symbols + + + + + @@ -65,41 +110,11 @@ - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + diff --git a/sources/gui/src/pppoewidget.ui b/sources/gui/src/pppoewidget.ui index 11dc763..5392b36 100644 --- a/sources/gui/src/pppoewidget.ui +++ b/sources/gui/src/pppoewidget.ui @@ -6,8 +6,8 @@ 0 0 - 431 - 602 + 484 + 561 @@ -28,19 +28,28 @@ - - - 150 - 0 - + + + 1 + 0 + Username + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The username and password to connect with @@ -52,19 +61,28 @@ - - - 150 - 0 - + + + 1 + 0 + Password + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The username and password to connect with @@ -76,19 +94,28 @@ - - - 150 - 0 - + + + 1 + 0 + Connection mode + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + This option specifies how a connection should be established @@ -111,19 +138,28 @@ - - - 150 - 0 - + + + 1 + 0 + Idle timeout + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + This option specifies the idle time (in seconds) after which ‘pppd’ should disconnect @@ -157,13 +193,16 @@ - - - Show advanced - + true + + true + + + Qt::DownArrow + @@ -171,23 +210,174 @@ + + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Use the default route provided by the peer + + + Default route + + + true + + + + + + + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Use the DNS provided by the peer + + + Use peer DNS + + + true + + + + + + + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Enable IPv6 support + + + PPPoE IPv6 + + + + + + + + + + + + 7 + 0 + + + + Options file + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 10 + 0 + + + + A file to read additional pppd options from + + + + + + + + 4 + 0 + + + + Browse + + + + + - - - 150 - 0 - + + + 1 + 0 + Max fail + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The number of consecutive failed connection attempts to tolerate @@ -201,49 +391,32 @@ - - - - Use the default route provided by the peer - - - Default route - - - true - - - - - - - Use the DNS provided by the peer - - - Use peer DNS - - - true - - - - - - 150 - 0 - + + + 1 + 0 + PPP unit + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Set the ppp unit number in the interface name (ppp0, ppp1, etc.) @@ -255,19 +428,28 @@ - - - 150 - 0 - + + + 1 + 0 + LCP echo interval + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + These options override default LCP parameters from ‘/etc/ppp/options’ @@ -288,19 +470,28 @@ - - - 150 - 0 - + + + 1 + 0 + LCP echo failure + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + These options override default LCP parameters from ‘/etc/ppp/options’ @@ -314,54 +505,32 @@ - - - - - - - 150 - 0 - - - - Options file - - - - - - - A file to read additional pppd options from - - - - - - - Browse - - - - - - - - 150 - 0 - + + + 1 + 0 + PPPoE service + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + This option specifies the PPPoE service name @@ -373,19 +542,28 @@ - - - 150 - 0 - + + + 1 + 0 + PPPoE AC + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + This option specifies the PPPoE access concentrator name @@ -397,19 +575,28 @@ - - - 150 - 0 - + + + 1 + 0 + PPPoE session + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + This option specifies an existing session to attach to, MAC address @@ -421,19 +608,28 @@ - - - 150 - 0 - + + + 1 + 0 + PPPoE MAC + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Only connect to specified MAC address @@ -441,16 +637,6 @@ - - - - Enable IPv6 support - - - PPPoE IPv6 - - - diff --git a/sources/gui/src/settingswindow.ui b/sources/gui/src/settingswindow.ui index aeca2ba..cf3230d 100644 --- a/sources/gui/src/settingswindow.ui +++ b/sources/gui/src/settingswindow.ui @@ -6,7 +6,7 @@ 0 0 - 678 + 764 395 @@ -19,11 +19,11 @@ - - - 180 - 16777215 - + + + 2 + 0 + QAbstractItemView::NoEditTriggers @@ -118,6 +118,12 @@ + + + 6 + 0 + + 0 @@ -136,7 +142,7 @@ 0 0 - 462 + 542 330 @@ -145,13 +151,28 @@ + + + 1 + 0 + + Language + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Select a language @@ -160,32 +181,112 @@ - - - Enable system tray - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Enable system tray + + + + - - - Minimize to tray instead of closing - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Minimize to tray instead of closing + + + + - - - Start minimized to tray - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Start minimized to tray + + + + - - - Skip components checking - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Skip components checking + + + + @@ -218,7 +319,7 @@ 0 0 - 462 + 542 330 @@ -237,6 +338,12 @@ + + + 7 + 0 + + 150 @@ -246,30 +353,29 @@ Helper status + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + 10 + 0 + + + + 4 + 0 + + Start @@ -283,66 +389,114 @@ - - - Use helper - - - - - - - Force use sudo in helper - - - - - - - Close helper after exit (doesn't work while systemd service is active) - - - - - + - - - Control group + + + + 7 + 0 + - - - Select a language + + + + 14 + 0 + + + + Use helper - + - - - - 150 - 0 - - - - Helper command + + + + 7 + 0 + - + + + + 14 + 0 + + + + Force use sudo in helper + + + + + + + + + + + + 7 + 0 + + + - + + + + 14 + 0 + + - Browse + Close helper after exit + + + + + + + + + + + + 1 + 0 + + + + Control group + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 2 + 0 + + + + Select a language @@ -352,19 +506,28 @@ - - - 150 - 0 - + + + 1 + 0 + Helper service + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Name of netctlgui-helper service @@ -372,6 +535,49 @@ + + + + + + + 7 + 0 + + + + Helper command + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 10 + 0 + + + + + + + + + 4 + 0 + + + + Browse + + + + + @@ -406,121 +612,37 @@ 0 0 - 462 + 542 330 - - - - - - - 150 - 0 - - - - systemctl path - - - - - - - Path to systemctl - - - - - - - Browse - - - - - - - - - - - - 150 - 0 - - - - netctl path - - - - - - - Path to netctl - - - - - - - Browse - - - - - - - - - - - - 150 - 0 - - - - netctl-auto path - - - - - - - Path to netctl-auto - - - - - - - Browse - - - - - - - - 150 - 0 - + + + 1 + 0 + netctl-auto service + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Name of netctl-auto systemd service @@ -532,19 +654,28 @@ - - - 150 - 0 - + + + 7 + 0 + Profile path + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + Path to profile directory @@ -552,6 +683,150 @@ + + + 4 + 0 + + + + Browse + + + + + + + + + + + + 7 + 0 + + + + systemctl path + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 10 + 0 + + + + Path to systemctl + + + + + + + + 4 + 0 + + + + Browse + + + + + + + + + + + + 7 + 0 + + + + netctl path + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 10 + 0 + + + + Path to netctl + + + + + + + + 4 + 0 + + + + Browse + + + + + + + + + + + + 7 + 0 + + + + netctl-auto path + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 10 + 0 + + + + Path to netctl-auto + + + + + + + + 4 + 0 + + Browse @@ -593,7 +868,7 @@ 0 0 - 462 + 542 330 @@ -602,19 +877,28 @@ - - - 150 - 0 - + + + 7 + 0 + sudo path + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + Path to sudo @@ -622,6 +906,12 @@ + + + 4 + 0 + + Browse @@ -663,7 +953,7 @@ 0 0 - 462 + 542 330 @@ -672,19 +962,28 @@ - - - 150 - 0 - + + + 7 + 0 + wpa_supplicant path + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + Path to wpa_supplicant @@ -692,6 +991,12 @@ + + + 4 + 0 + + Browse @@ -703,19 +1008,28 @@ - - - 150 - 0 - + + + 7 + 0 + wpa_cli path + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + Path to wpa_cli @@ -723,6 +1037,12 @@ + + + 4 + 0 + + Browse @@ -734,19 +1054,28 @@ - - - 150 - 0 - + + + 7 + 0 + PID file + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 14 + 0 + + wpa_supplicant PID file @@ -758,19 +1087,28 @@ - - - 150 - 0 - + + + 7 + 0 + wpa_supplicant drivers + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 14 + 0 + + wpa_supplicant drivers comma separated @@ -782,6 +1120,12 @@ + + + 7 + 0 + + 150 @@ -791,10 +1135,19 @@ ctrl_interface directory + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 14 + 0 + + Path to control directory @@ -806,19 +1159,28 @@ - - - 150 - 0 - + + + 7 + 0 + ctrl_interface group + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 14 + 0 + + Group of control directory @@ -860,7 +1222,7 @@ 0 0 - 462 + 542 330 @@ -869,19 +1231,28 @@ - - - 150 - 0 - + + + 7 + 0 + Path to interface list + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + Path to directory which contains network devices @@ -889,6 +1260,12 @@ + + + 4 + 0 + + Browse @@ -900,19 +1277,28 @@ - - - 150 - 0 - + + + 7 + 0 + Path to rfkill device list + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + Path to directory which contains rfkill devices @@ -920,6 +1306,12 @@ + + + 4 + 0 + + Browse @@ -931,19 +1323,28 @@ - - - 150 - 0 - + + + 7 + 0 + Prefered wireless interface + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 14 + 0 + + Prefered wireless interface diff --git a/sources/gui/src/tunnelwidget.ui b/sources/gui/src/tunnelwidget.ui index c6b6962..7f38aa2 100644 --- a/sources/gui/src/tunnelwidget.ui +++ b/sources/gui/src/tunnelwidget.ui @@ -28,19 +28,28 @@ - - - 150 - 0 - + + + 1 + 0 + Mode + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The tunnel type @@ -92,19 +101,28 @@ - - - 150 - 0 - + + + 1 + 0 + Local + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The address of the local end of the tunnel @@ -116,19 +134,28 @@ - - - 150 - 0 - + + + 1 + 0 + Remote + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The address of the remote end of the tunnel diff --git a/sources/gui/src/tuntapwidget.ui b/sources/gui/src/tuntapwidget.ui index 45e4976..786a2ed 100644 --- a/sources/gui/src/tuntapwidget.ui +++ b/sources/gui/src/tuntapwidget.ui @@ -28,19 +28,28 @@ - - - 150 - 0 - + + + 1 + 0 + Mode + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Either ‘tun’, or ‘tap’ @@ -62,19 +71,28 @@ - - - 150 - 0 - + + + 1 + 0 + User + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The owning user of the tun/tap interface @@ -86,19 +104,28 @@ - - - 150 - 0 - + + + 1 + 0 + Group + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The owning group of the tun/tap interface diff --git a/sources/gui/src/vlanwidget.ui b/sources/gui/src/vlanwidget.ui index 2000cbc..f385561 100644 --- a/sources/gui/src/vlanwidget.ui +++ b/sources/gui/src/vlanwidget.ui @@ -28,19 +28,28 @@ - - - 150 - 0 - + + + 1 + 0 + vlan ID + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + vlan identifier diff --git a/sources/gui/src/wirelesswidget.ui b/sources/gui/src/wirelesswidget.ui index c86558d..da21e18 100644 --- a/sources/gui/src/wirelesswidget.ui +++ b/sources/gui/src/wirelesswidget.ui @@ -6,7 +6,7 @@ 0 0 - 431 + 584 776 @@ -28,19 +28,28 @@ - - - 150 - 0 - + + + 1 + 0 + Security + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + none @@ -75,19 +84,28 @@ - - - 150 - 0 - + + + 1 + 0 + ESSID + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The name of the network to connect to @@ -103,22 +121,38 @@ - - - 150 - 0 - + + + 7 + 0 + Wpa config section + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + + + + 4 + 0 + + Add @@ -147,19 +181,28 @@ - - - 150 - 0 - + + + 7 + 0 + Wpa config file + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + Path to a wpa_supplicant configuration file @@ -167,6 +210,12 @@ + + + 4 + 0 + + Browse @@ -180,19 +229,28 @@ - - - 150 - 0 - + + + 1 + 0 + Key + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The secret key to a WEP, or WPA encrypted network @@ -201,26 +259,6 @@ - - - - Whether or not the specified network is a hidden network - - - Hidden - - - - - - - Whether or not to use ad-hoc mode - - - Ad-hoc - - - @@ -237,13 +275,16 @@ - - - Show advanced - + true + + true + + + Qt::DownArrow + @@ -251,25 +292,124 @@ + + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Whether or not to exclude this profile from automatic profile selection + + + Exclude auto + + + + + + + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Whether or not the specified network is a hidden network + + + Hidden + + + + + + + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Whether or not to use ad-hoc mode + + + Ad-hoc + + + + + - - - 150 - 0 - + + + 7 + 0 + Scan frequencies + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + 2000 @@ -283,6 +423,12 @@ + + + 4 + 0 + + Add @@ -309,19 +455,28 @@ - - - 150 - 0 - + + + 1 + 0 + Frequency + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Priority group for the network @@ -339,19 +494,28 @@ - - - 150 - 0 - + + + 1 + 0 + Priority + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Priority group for the network @@ -363,19 +527,28 @@ - - - 150 - 0 - + + + 1 + 0 + Country + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The country for which frequency regulations will be enforced @@ -387,19 +560,28 @@ - - - 150 - 0 - + + + 1 + 0 + WPA group + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Group that has the authority to configure wpa_supplicant via its control interface @@ -413,19 +595,28 @@ - - - 150 - 0 - + + + 7 + 0 + Drivers + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 10 + 0 + + west @@ -445,6 +636,12 @@ + + + 4 + 0 + + Add @@ -471,19 +668,28 @@ - - - 150 - 0 - + + + 1 + 0 + RFkill device + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + The name of an rfkill device @@ -495,19 +701,28 @@ - - - 150 - 0 - + + + 1 + 0 + Timeout WPA + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 2 + 0 + + Maximum time, in seconds, to wait for steps in the association and authentication to succeed @@ -521,16 +736,6 @@ - - - - Whether or not to exclude this profile from automatic profile selection - - - Exclude auto - - - @@ -549,9 +754,6 @@ lineEdit_wpaConfig pushButton_wpaConfig lineEdit_key - checkBox_hidden - checkBox_adhoc - pushButton_wirelessAdvanced spinBox_freq pushButton_freq listWidget_freq @@ -564,7 +766,6 @@ listWidget_drivers comboBox_rfkill spinBox_timeoutWpa - checkBox_exclude diff --git a/sources/plasmoid-kde4/appearance.ui b/sources/plasmoid-kde4/appearance.ui index b106e34..6c9b404 100644 --- a/sources/plasmoid-kde4/appearance.ui +++ b/sources/plasmoid-kde4/appearance.ui @@ -37,27 +37,37 @@ - - - 80 - 23 - + + + 7 + 0 + Inactive icon + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + - - - 100 - 0 - + + + 4 + 0 + Browse @@ -70,44 +80,28 @@ - - - 80 - 23 - + + + 1 + 0 + Font color + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - 0 + 2 0 - - - 100 - 23 - - Set font color @@ -132,50 +126,31 @@ - - - 80 - 23 - + + + 1 + 0 + Font size + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - 0 + 2 0 - - - 100 - 23 - - Set font size - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 7 @@ -193,50 +168,31 @@ - - - 80 - 23 - + + + 1 + 0 + Font weight + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - 0 + 2 0 - - - 100 - 23 - - Set font weight - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 300 @@ -257,44 +213,28 @@ - - - 80 - 23 - + + + 1 + 0 + Font style + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - 0 + 2 0 - - - 100 - 23 - - Set font style @@ -316,44 +256,28 @@ - - - 80 - 23 - + + + 1 + 0 + Font + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - 0 + + 2 0 - - - 180 - 23 - - Set font family @@ -365,27 +289,37 @@ - - - 80 - 23 - + + + 7 + 0 + Active icon + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + - - - 100 - 0 - + + + 4 + 0 + Browse @@ -398,44 +332,28 @@ - - - 80 - 23 - + + + 1 + 0 + Text align + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - 0 + 2 0 - - - 100 - 23 - - Set text align diff --git a/sources/plasmoid-kde4/dataengine.ui b/sources/plasmoid-kde4/dataengine.ui index 019f720..ac39457 100644 --- a/sources/plasmoid-kde4/dataengine.ui +++ b/sources/plasmoid-kde4/dataengine.ui @@ -24,27 +24,37 @@ - - - 150 - 23 - + + + 7 + 0 + Path to netctl + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -57,27 +67,37 @@ - - - 150 - 23 - + + + 7 + 0 + Path to netctl-auto + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -90,11 +110,14 @@ - - - 150 - 23 - + + + 7 + 0 + + + + Qt::RightToLeft Check external IPv4 @@ -105,15 +128,22 @@ - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -126,11 +156,14 @@ - - - 150 - 23 - + + + 7 + 0 + + + + Qt::RightToLeft Check external IPv6 @@ -141,15 +174,22 @@ - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse diff --git a/sources/plasmoid-kde4/widget.ui b/sources/plasmoid-kde4/widget.ui index f4b1d07..3163c78 100644 --- a/sources/plasmoid-kde4/widget.ui +++ b/sources/plasmoid-kde4/widget.ui @@ -6,7 +6,7 @@ 0 0 - 480 + 550 340 @@ -24,43 +24,27 @@ - - - 150 - 23 - + + + 1 + 0 + Auto update interval, msec + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - 100 - 0 - - - - Qt::LeftToRight - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 2 + 0 + 333 @@ -82,27 +66,37 @@ - - - 150 - 23 - + + + 7 + 0 + Path to GUI + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -115,11 +109,14 @@ - - - 150 - 23 - + + + 7 + 0 + + + + Qt::RightToLeft Use helper @@ -130,15 +127,22 @@ - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -151,27 +155,37 @@ - - - 150 - 23 - + + + 7 + 0 + Path to netctl + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -184,27 +198,37 @@ - - - 150 - 23 - + + + 7 + 0 + Path to netctl-auto + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -217,11 +241,14 @@ - - - 150 - 23 - + + + 7 + 0 + + + + Qt::RightToLeft Use sudo for netctl @@ -232,15 +259,22 @@ - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -253,11 +287,14 @@ - - - 150 - 23 - + + + 7 + 0 + + + + Qt::RightToLeft Show 'Start WiFi menu' @@ -268,15 +305,22 @@ - + + + + 10 + 0 + + + - - - 100 - 23 - + + + 4 + 0 + Browse @@ -286,14 +330,34 @@ - - - Show more detailed interface - - - true - - + + + + + + 1 + 0 + + + + + + + + + 2 + 0 + + + + Show more detailed interface + + + true + + + +