small update

This commit is contained in:
arcan1s
2015-02-18 16:23:07 +03:00
parent a73968f98b
commit 4c20a54d7e
7 changed files with 88 additions and 49 deletions

View File

@ -99,7 +99,7 @@ QStringList ErrorWindow::getMessage(const int mess, const QString custom)
break;
case 14:
title = QApplication::translate("ErrorWindow", "Error!");
message = QApplication::translate("ErrorWindow", "APN is not set");
message = QApplication::translate("ErrorWindow", "User is not in network group, helper will not be started");
break;
case 15:
title = QApplication::translate("ErrorWindow", "Error!");

View File

@ -809,7 +809,7 @@ void MainWindow::profileTabCreateProfile()
return errorWin->showWindow(12, QString(PDEBUG));
} else if (generalWid->connectionType->currentText() == QString("mobile_ppp")) {
if (mobileWid->isOk() == 1)
return errorWin->showWindow(14, QString(PDEBUG));
return errorWin->showWindow(15, QString(PDEBUG));
if (mobileWid->isOk() == 2)
return errorWin->showWindow(7, QString(PDEBUG));
}

View File

@ -135,6 +135,7 @@ 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")]);
@ -422,6 +423,7 @@ 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();

View File

@ -303,6 +303,24 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="layout_group">
<item>
<widget class="QLabel" name="label_group">
<property name="text">
<string>Control group</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_group">
<property name="toolTip">
<string>Select a language</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layout_helperPath">
<item>
@ -388,8 +406,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>436</width>
<height>173</height>
<width>462</width>
<height>330</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
@ -575,8 +593,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>436</width>
<height>45</height>
<width>462</width>
<height>330</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@ -645,8 +663,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>277</width>
<height>194</height>
<width>462</width>
<height>330</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
@ -842,8 +860,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>436</width>
<height>107</height>
<width>462</width>
<height>330</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">