added netctl-auto support to profiles

This commit is contained in:
arcan1s 2014-07-12 13:36:06 +04:00
parent ec6834d90e
commit ae001b4d7f
3 changed files with 73 additions and 18 deletions

View File

@ -69,7 +69,6 @@ Additional information
TODO (wish list) TODO (wish list)
---------------- ----------------
* netctl-auto support to profiles
* netctl-auto support to dataengine * netctl-auto support to dataengine
* man pages * man pages
* code review * code review

View File

@ -204,6 +204,7 @@ void MainWindow::createActions()
connect(ui->pushButton_mainRefresh, SIGNAL(clicked(bool)), this, SLOT(updateMainTab())); connect(ui->pushButton_mainRefresh, SIGNAL(clicked(bool)), this, SLOT(updateMainTab()));
connect(ui->pushButton_mainRestart, SIGNAL(clicked(bool)), this, SLOT(mainTabRestartProfile())); connect(ui->pushButton_mainRestart, SIGNAL(clicked(bool)), this, SLOT(mainTabRestartProfile()));
connect(ui->pushButton_mainStart, SIGNAL(clicked(bool)), this, SLOT(mainTabStartProfile())); connect(ui->pushButton_mainStart, SIGNAL(clicked(bool)), this, SLOT(mainTabStartProfile()));
connect(ui->pushButton_netctlAuto, SIGNAL(clicked(bool)), netctlAutoWin, SLOT(showWindow()));
connect(ui->tableWidget_main, SIGNAL(itemActivated(QTableWidgetItem *)), this, SLOT(mainTabStartProfile())); connect(ui->tableWidget_main, SIGNAL(itemActivated(QTableWidgetItem *)), this, SLOT(mainTabStartProfile()));
connect(ui->tableWidget_main, SIGNAL(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)), this, SLOT(mainTabRefreshButtons(QTableWidgetItem *, QTableWidgetItem *))); connect(ui->tableWidget_main, SIGNAL(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)), this, SLOT(mainTabRefreshButtons(QTableWidgetItem *, QTableWidgetItem *)));
connect(ui->tableWidget_main, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(mainTabContextualMenu(QPoint))); connect(ui->tableWidget_main, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(mainTabContextualMenu(QPoint)));
@ -321,7 +322,12 @@ void MainWindow::updateMainTab()
} }
ui->tabWidget->setDisabled(true); ui->tabWidget->setDisabled(true);
QList<QStringList> profiles = netctlCommand->getProfileList();; QList<QStringList> profiles = netctlCommand->getProfileList();
if (netctlCommand->isNetctlAutoRunning())
ui->widget_netctlAuto->setHidden(false);
else
ui->widget_netctlAuto->setHidden(true);
ui->tableWidget_main->setSortingEnabled(false); ui->tableWidget_main->setSortingEnabled(false);
ui->tableWidget_main->selectRow(-1); ui->tableWidget_main->selectRow(-1);

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>483</width> <width>481</width>
<height>511</height> <height>509</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -25,6 +25,32 @@
<string>Connect to profile</string> <string>Connect to profile</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QWidget" name="widget_netctlAuto" native="true">
<layout class="QHBoxLayout" name="layout_netctlAuto">
<item>
<widget class="QLabel" name="label_netctlAuto">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>netctl-auto is running</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_netctlAuto">
<property name="text">
<string>Show</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QTableWidget" name="tableWidget_main"> <widget class="QTableWidget" name="tableWidget_main">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
@ -180,7 +206,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>451</width> <width>449</width>
<height>353</height> <height>353</height>
</rect> </rect>
</property> </property>
@ -341,7 +367,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>483</width> <width>481</width>
<height>22</height> <height>22</height>
</rect> </rect>
</property> </property>
@ -404,7 +430,9 @@
</action> </action>
<action name="actionMainRefresh"> <action name="actionMainRefresh">
<property name="icon"> <property name="icon">
<iconset theme="stock-refresh"/> <iconset theme="stock-refresh">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Refresh</string> <string>Refresh</string>
@ -412,7 +440,9 @@
</action> </action>
<action name="actionMainStart"> <action name="actionMainStart">
<property name="icon"> <property name="icon">
<iconset theme="dialog-apply"/> <iconset theme="dialog-apply">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Start profile</string> <string>Start profile</string>
@ -420,7 +450,9 @@
</action> </action>
<action name="actionMainRestart"> <action name="actionMainRestart">
<property name="icon"> <property name="icon">
<iconset theme="stock-refresh"/> <iconset theme="stock-refresh">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Restart profile</string> <string>Restart profile</string>
@ -428,7 +460,9 @@
</action> </action>
<action name="actionMainEnable"> <action name="actionMainEnable">
<property name="icon"> <property name="icon">
<iconset theme="edit-add"/> <iconset theme="edit-add">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Enable profile</string> <string>Enable profile</string>
@ -436,7 +470,9 @@
</action> </action>
<action name="actionMainEdit"> <action name="actionMainEdit">
<property name="icon"> <property name="icon">
<iconset theme="edit"/> <iconset theme="edit">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Edit profile</string> <string>Edit profile</string>
@ -444,7 +480,9 @@
</action> </action>
<action name="actionMainRemove"> <action name="actionMainRemove">
<property name="icon"> <property name="icon">
<iconset theme="edit-delete"/> <iconset theme="edit-delete">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Remove profile</string> <string>Remove profile</string>
@ -452,7 +490,9 @@
</action> </action>
<action name="actionProfileClear"> <action name="actionProfileClear">
<property name="icon"> <property name="icon">
<iconset theme="edit-clear"/> <iconset theme="edit-clear">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Clear</string> <string>Clear</string>
@ -460,7 +500,9 @@
</action> </action>
<action name="actionWifiRefresh"> <action name="actionWifiRefresh">
<property name="icon"> <property name="icon">
<iconset theme="stock-refresh"/> <iconset theme="stock-refresh">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Refresh</string> <string>Refresh</string>
@ -468,7 +510,9 @@
</action> </action>
<action name="actionProfileLoad"> <action name="actionProfileLoad">
<property name="icon"> <property name="icon">
<iconset theme="document-open"/> <iconset theme="document-open">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Load profile</string> <string>Load profile</string>
@ -476,7 +520,9 @@
</action> </action>
<action name="actionProfileSave"> <action name="actionProfileSave">
<property name="icon"> <property name="icon">
<iconset theme="document-save"/> <iconset theme="document-save">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Save profile</string> <string>Save profile</string>
@ -484,7 +530,9 @@
</action> </action>
<action name="actionWifiStart"> <action name="actionWifiStart">
<property name="icon"> <property name="icon">
<iconset theme="dialog-apply"/> <iconset theme="dialog-apply">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Start Wi-Fi</string> <string>Start Wi-Fi</string>
@ -492,7 +540,9 @@
</action> </action>
<action name="actionProfileRemove"> <action name="actionProfileRemove">
<property name="icon"> <property name="icon">
<iconset theme="edit-delete"/> <iconset theme="edit-delete">
<normaloff/>
</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Remove profile</string> <string>Remove profile</string>