update submodule

update netctl-auto
update interfaces
This commit is contained in:
arcan1s
2015-03-15 18:17:49 +03:00
parent f80d6aae6b
commit 3f49988cef
19 changed files with 220 additions and 378 deletions

View File

@ -38,7 +38,20 @@ MainWidget::MainWidget(QWidget *parent, const QMap<QString, QString> settings, c
mainWindow = dynamic_cast<MainWindow *>(parent);
useHelper = (configuration[QString("USE_HELPER")] == QString("true"));
createObjects();
// windows
ui = new Ui::MainWidget;
ui->setupUi(this);
ui->tableWidget_main->setColumnHidden(2, true);
ui->tableWidget_main->setColumnHidden(3, true);
updateToolBarState(static_cast<Qt::ToolBarArea>(configuration[QString("NETCTL_TOOLBAR")].toInt()));
// append toolbar
QMenu *actionMenu = new QMenu(this);
actionMenu->addAction(ui->actionSwitch);
actionMenu->addAction(ui->actionRestart);
actionMenu->addAction(ui->actionEnable);
ui->actionStart->setMenu(actionMenu);
createActions();
}
@ -47,7 +60,7 @@ MainWidget::~MainWidget()
{
if (debug) qDebug() << PDEBUG;
deleteObjects();
if (ui != nullptr) delete ui;
}
@ -414,31 +427,3 @@ void MainWidget::createActions()
this, SLOT(updateMenuMain()));
connect(ui->tableWidget_main, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(mainTabContextualMenu(QPoint)));
}
void MainWidget::createObjects()
{
if (debug) qDebug() << PDEBUG;
// windows
ui = new Ui::MainWidget;
ui->setupUi(this);
ui->tableWidget_main->setColumnHidden(2, true);
ui->tableWidget_main->setColumnHidden(3, true);
updateToolBarState(static_cast<Qt::ToolBarArea>(configuration[QString("NETCTL_TOOLBAR")].toInt()));
// append toolbar
QMenu *actionMenu = new QMenu(this);
actionMenu->addAction(ui->actionSwitch);
actionMenu->addAction(ui->actionRestart);
actionMenu->addAction(ui->actionEnable);
ui->actionStart->setMenu(actionMenu);
}
void MainWidget::deleteObjects()
{
if (debug) qDebug() << PDEBUG;
if (ui != nullptr) delete ui;
}