arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-06 10:35:46 +00:00
Code Issues Projects Releases Wiki Activity

implement #36

Browse Source 
update translations
This commit is contained in:
arcan1s
2015-03-17 13:22:45 +03:00
parent e4bcfb1653
commit bf7521481a
23 changed files with 4927 additions and 2933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/gui/docs/.directory
View File

@ -1,3 +0,0 @@
[Dolphin]
Timestamp=2015,3,7,17,10,22
Version=3

112
sources/gui/src/settingswindow.cpp
View File

@ -23,11 +23,14 @@
#include <QFileDialog>
#include <QTextStream>
#include <QSettings>
#include <grp.h>
#include <language/language.h>
#include <pdebug/pdebug.h>
#include <task/taskadds.h>
#include "mainwindow.h"
#include "version.h"
SettingsWindow::SettingsWindow(QWidget *parent, const bool debugCmd, const QString configFile)
@ -38,6 +41,7 @@ SettingsWindow::SettingsWindow(QWidget *parent, const bool debugCmd, const QStri
{
ui->setupUi(this);
addLanguages();
addGroups();
createActions();
}
@ -58,6 +62,7 @@ void SettingsWindow::createActions()
connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(closeWindow()));
connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this, SLOT(restoreSettings()));
connect(ui->buttonBox->button(QDialogButtonBox::RestoreDefaults), SIGNAL(clicked(bool)), this, SLOT(setDefault()));
connect(ui->buttonBox_applyGroup->button(QDialogButtonBox::Apply), SIGNAL(clicked(bool)), this, SLOT(applyHelperGroup()));
connect(ui->checkBox_enableTray, SIGNAL(stateChanged(int)), this, SLOT(setTray()));
connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
this, SLOT(changePage(QTreeWidgetItem *, QTreeWidgetItem *)));
@ -137,6 +142,78 @@ void SettingsWindow::addLanguages()
}
void SettingsWindow::applyHelperGroup()
{
if (debug) qDebug() << PDEBUG;
QString group = ui->comboBox_group->currentText();
if (debug) qDebug() << PDEBUG << ":" << "Group" << group;
if (group.isEmpty()) return;
// create
QFile policyFile(QString("%1/org.netctlgui.helper.conf").arg(QDir::tempPath()));
if (debug) qDebug() << PDEBUG << ":" << "Save to" << policyFile.fileName();
if (!policyFile.open(QIODevice::WriteOnly | QIODevice::Text)) return;
// write
QTextStream out(&policyFile);
// header
out << "<!DOCTYPE busconfig PUBLIC" << endl;
out << " \"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN\"" << endl;
out << " \"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd\">" << endl;
out << "<busconfig>" << endl;
// group body
out << " <policy group=\"" << group << "\">" << endl;
out << " <allow own=\"org.netctlgui.helper\"/>" << endl;
out << " <allow send_destination=\"org.netctlgui.helper\"/>" << endl;
out << " <allow receive_sender=\"org.netctlgui.helper\"/>" << endl;
out << " </policy>" << endl;
// root body
out << " <policy user=\"root\">" << endl;
out << " <allow own=\"org.netctlgui.helper\"/>" << endl;
out << " <allow send_destination=\"org.netctlgui.helper\"/>" << endl;
out << " <allow receive_sender=\"org.netctlgui.helper\"/>" << endl;
out << " </policy>" << endl;
// footer
out << "</busconfig>" << endl;
policyFile.close();
// copy
QString newPath = QString("%1/org.netctlgui.helper.conf").arg(PROJECT_DBUS_SYSTEMCONF_PATH);
QString cmd = QString("%1 /usr/bin/mv \"%2\" \"%3\"").arg(ui->lineEdit_sudo->text())
.arg(policyFile.fileName())
.arg(newPath);
if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
TaskResult process = runTask(cmd, false);
if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
if (process.exitCode != 0)
if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
// update
setHelperGroup();
}
void SettingsWindow::addGroups()
{
if (debug) qDebug() << PDEBUG;
ui->comboBox_group->clear();
QFile groupFile(QString("/etc/group"));
if (!groupFile.open(QIODevice::ReadOnly)) return;
while (true) {
QString fileStr = QString(groupFile.readLine()).trimmed();
if ((fileStr.isEmpty()) && (!groupFile.atEnd())) continue;
if ((fileStr[0] == QChar('#')) && (!groupFile.atEnd())) continue;
if ((fileStr[0] == QChar(';')) && (!groupFile.atEnd())) continue;
if (fileStr.contains(QChar(':'))) ui->comboBox_group->addItem(fileStr.split(QChar(':'))[0]);
if (groupFile.atEnd()) break;
}
groupFile.close();
}
void SettingsWindow::changePage(QTreeWidgetItem *current, QTreeWidgetItem *previous)
{
Q_UNUSED(previous);
@ -177,7 +254,6 @@ void SettingsWindow::saveSettings()
settings.beginGroup(QString("Helper"));
settings.setValue(QString("USE_HELPER"), config[QString("USE_HELPER")]);
settings.setValue(QString("HELPER_GROUP"), config[QString("HELPER_GROUP")]);
settings.setValue(QString("FORCE_SUDO"), config[QString("FORCE_SUDO")]);
settings.setValue(QString("CLOSE_HELPER"), config[QString("CLOSE_HELPER")]);
settings.setValue(QString("HELPER_PATH"), config[QString("HELPER_PATH")]);
@ -223,6 +299,38 @@ void SettingsWindow::saveSettings()
}
void SettingsWindow::setHelperGroup()
{
if (debug) qDebug() << PDEBUG;
QString group;
QFile policyFile(QString("%1/org.netctlgui.helper.conf").arg(QString(PROJECT_DBUS_SYSTEMCONF_PATH)));
if (!policyFile.open(QIODevice::ReadOnly)) return;
while (true) {
QString fileStr = QString(policyFile.readLine()).trimmed();
if ((fileStr.isEmpty()) && (!policyFile.atEnd())) continue;
if ((fileStr[0] == QChar('#')) && (!policyFile.atEnd())) continue;
if ((fileStr[0] == QChar(';')) && (!policyFile.atEnd())) continue;
if (fileStr.contains(QString("policy group"))) try {
// line is ' <policy group="network">'
QStringList fields = fileStr.split(QChar(' '), QString::SkipEmptyParts);
group = fields[1].split(QChar('='))[1];
group.remove(QChar('<')).remove(QChar('>')).remove(QChar('\'')).remove(QChar('"'));
if (debug) qDebug() << PDEBUG << ":" << "Group detected" << group;
} catch (...) {
if (debug) qDebug() << PDEBUG << ":" << "An exception recevied";
return;
}
if (policyFile.atEnd()) break;
}
policyFile.close();
if (group.isEmpty()) return;
int index = ui->comboBox_group->findText(group);
ui->comboBox_group->setCurrentIndex(index);
}
void SettingsWindow::setTray()
{
if (debug) qDebug() << PDEBUG;
@ -311,6 +419,7 @@ void SettingsWindow::showWindow()
{
if (debug) qDebug() << PDEBUG;
setHelperGroup();
setSettings(getSettings());
setTray();
updateHelper();
@ -478,7 +587,6 @@ QMap<QString, QString> SettingsWindow::getSettings(QString fileName)
settings.beginGroup(QString("Helper"));
config[QString("USE_HELPER")] = settings.value(QString("USE_HELPER"), QString("true")).toString();
config[QString("HELPER_GROUP")] = settings.value(QString("HELPER_GROUP"), QString("network")).toString();
config[QString("FORCE_SUDO")] = settings.value(QString("FORCE_SUDO"), QString("false")).toString();
config[QString("CLOSE_HELPER")] = settings.value(QString("CLOSE_HELPER"), QString("false")).toString();
config[QString("HELPER_PATH")] = settings.value(QString("HELPER_PATH"), QString("/usr/bin/netctlgui-helper")).toString();

3
sources/gui/src/settingswindow.h
View File

@ -48,9 +48,12 @@ public slots:
void showWindow();
private slots:
void addGroups();
void addLanguages();
void applyHelperGroup();
void changePage(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void saveSettings();
void setHelperGroup();
void setTray();
void updateHelper();
// buttons

98
sources/gui/src/settingswindow.ui
View File

@ -119,7 +119,9 @@
<string>Toolbars</string>
</property>
<property name="icon">
<iconset theme="configure-toolbars"/>
<iconset theme="configure-toolbars">
<normaloff/>
</iconset>
</property>
</item>
</widget>
@ -477,39 +479,6 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layout_group">
<item>
<widget class="QLabel" name="label_group">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Control group</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_group">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Select a language</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layout_helperService">
<item>
@ -586,6 +555,59 @@
</item>
</layout>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="layout_group">
<item>
<widget class="QLabel" name="label_group">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>7</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Control group</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_group">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Select a language</string>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox_applyGroup">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>4</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="spacer_helper">
<property name="orientation">
@ -1230,8 +1252,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>542</width>
<height>330</height>
<width>436</width>
<height>107</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
@ -1391,8 +1413,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>542</width>
<height>330</height>
<width>201</width>
<height>177</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">

12
sources/gui/src/wifimenuwidget.cpp
View File

@ -20,6 +20,7 @@
#include <QDebug>
#include <QMenu>
#include <QMessageBox>
#include <pdebug/pdebug.h>
@ -352,6 +353,7 @@ bool WiFiMenuWidget::wifiTabSetEnabled(const bool state)
if (debug) qDebug() << PDEBUG;
if (debug) qDebug() << PDEBUG << ":" << "State" << state;
ui->actionFunc->setEnabled(!state);
ui->tableWidget_wifi->setEnabled(state);
if (!state) ui->label_wifi->setText(QApplication::translate("WiFiMenuWidget", "Please install 'wpa_supplicant' before use it"));
@ -359,6 +361,15 @@ bool WiFiMenuWidget::wifiTabSetEnabled(const bool state)
}
int WiFiMenuWidget::wifiTabShowInfo()
{
if (debug) qDebug() << PDEBUG;
return QMessageBox::information(this, QApplication::translate("WiFiMenuWidget", "Information"),
QApplication::translate("WiFiMenuWidget", "This isn't the functionality you're looking for"));
}
void WiFiMenuWidget::wifiTabStart()
{
if (debug) qDebug() << PDEBUG;
@ -418,6 +429,7 @@ void WiFiMenuWidget::createActions()
if (debug) qDebug() << PDEBUG;
// menu actions
connect(ui->actionFunc, SIGNAL(triggered(bool)), this, SLOT(wifiTabShowInfo()));
connect(ui->actionRefresh, SIGNAL(triggered(bool)), this, SLOT(updateWifiTab()));
connect(ui->actionStart, SIGNAL(triggered(bool)), this, SLOT(wifiTabStart()));
// wifi tab events

1
sources/gui/src/wifimenuwidget.h
View File

@ -58,6 +58,7 @@ private slots:
// wifi tab slots
void wifiTabContextualMenu(const QPoint &pos);
bool wifiTabSetEnabled(const bool state);
int wifiTabShowInfo();
void wifiTabStart();
private:

2
sources/gui/src/wifimenuwidget.ui
View File

@ -113,6 +113,7 @@
<addaction name="actionRefresh"/>
<addaction name="separator"/>
<addaction name="actionStart"/>
<addaction name="actionFunc"/>
</widget>
<action name="actionRefresh">
<property name="icon">
@ -143,6 +144,7 @@
<string>Connect or disconnect from selected ESSID</string>
</property>
</action>
<action name="actionFunc"/>
</widget>
<resources/>
<connections/>