Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Removed account option

Browse source
This commit is contained in:
kervala 2016-06-11 16:57:19 +02:00
parent 3966c93a61
commit ac77d98aff
4 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -127,7 +127,6 @@ bool CConfigFile::load(const QString &filename)
profile.id = settings.value("id").toString(); profile.id = settings.value("id").toString();
profile.name = settings.value("name").toString(); profile.name = settings.value("name").toString();
profile.account = settings.value("account").toString();
profile.server = settings.value("server").toString(); profile.server = settings.value("server").toString();
profile.executable = settings.value("executable").toString(); profile.executable = settings.value("executable").toString();
profile.arguments = settings.value("arguments").toString(); profile.arguments = settings.value("arguments").toString();
@ -216,7 +215,6 @@ bool CConfigFile::save() const
settings.setValue("id", profile.id); settings.setValue("id", profile.id);
settings.setValue("name", profile.name); settings.setValue("name", profile.name);
settings.setValue("account", profile.account);
settings.setValue("server", profile.server); settings.setValue("server", profile.server);
settings.setValue("executable", profile.executable); settings.setValue("executable", profile.executable);
settings.setValue("arguments", profile.arguments); settings.setValue("arguments", profile.arguments);

1
code/ryzom/tools/client/ryzom_installer/src/configfile.h
View file

@ -54,7 +54,6 @@ struct CProfile
} }
QString id; QString id;
QString account;
QString name; QString name;
QString server; QString server;
QString executable; QString executable;

3
code/ryzom/tools/client/ryzom_installer/src/profilesdialog.cpp
View file

@ -85,7 +85,6 @@ void CProfilesDialog::displayProfile(int index)
bool enabled = index > -1; bool enabled = index > -1;
profileIdLabel->setEnabled(enabled); profileIdLabel->setEnabled(enabled);
accountEdit->setEnabled(enabled);
nameEdit->setEnabled(enabled); nameEdit->setEnabled(enabled);
serverComboBox->setEnabled(enabled); serverComboBox->setEnabled(enabled);
argumentsEdit->setEnabled(enabled); argumentsEdit->setEnabled(enabled);
@ -99,7 +98,6 @@ void CProfilesDialog::displayProfile(int index)
// update all widgets with content of profile // update all widgets with content of profile
profileIdLabel->setText(profile.id); profileIdLabel->setText(profile.id);
accountEdit->setText(profile.account);
nameEdit->setText(profile.name); nameEdit->setText(profile.name);
serverComboBox->setCurrentIndex(m_serversModel->getIndexFromServerID(profile.server)); serverComboBox->setCurrentIndex(m_serversModel->getIndexFromServerID(profile.server));
executablePathLabel->setText(QFileInfo(profile.executable).fileName()); executablePathLabel->setText(QFileInfo(profile.executable).fileName());
@ -120,7 +118,6 @@ void CProfilesDialog::saveProfile(int index)
CProfile &profile = m_model->getProfiles()[index]; CProfile &profile = m_model->getProfiles()[index];
profile.account = accountEdit->text();
profile.name = nameEdit->text(); profile.name = nameEdit->text();
profile.server = m_serversModel->getServerIDFromIndex(serverComboBox->currentIndex()); profile.server = m_serversModel->getServerIDFromIndex(serverComboBox->currentIndex());
profile.arguments = argumentsEdit->text(); profile.arguments = argumentsEdit->text();

43
code/ryzom/tools/client/ryzom_installer/ui/profiles.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>583</width> <width>583</width>
<height>368</height> <height>348</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -81,33 +81,23 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="accountLabel">
<property name="text">
<string>Account:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="accountEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="nameLabel"> <widget class="QLabel" name="nameLabel">
<property name="text"> <property name="text">
<string>Name:</string> <string>Name:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="nameEdit"/> <widget class="QLineEdit" name="nameEdit"/>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="serverLabel"> <widget class="QLabel" name="serverLabel">
<property name="text"> <property name="text">
<string>Server:</string> <string>Server:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="serverComboBox"> <widget class="QComboBox" name="serverComboBox">
<item> <item>
<property name="text"> <property name="text">
@ -121,14 +111,14 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<widget class="QLabel" name="executableLabel"> <widget class="QLabel" name="executableLabel">
<property name="text"> <property name="text">
<string>Executable:</string> <string>Executable:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<layout class="QHBoxLayout" name="executableLayout" stretch="1,0"> <layout class="QHBoxLayout" name="executableLayout" stretch="1,0">
<item> <item>
<widget class="QLabel" name="executablePathLabel"> <widget class="QLabel" name="executablePathLabel">
@ -146,38 +136,38 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0"> <item row="4" column="0">
<widget class="QLabel" name="clientVersionLabel"> <widget class="QLabel" name="clientVersionLabel">
<property name="text"> <property name="text">
<string>Client version:</string> <string>Client version:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="4" column="1">
<widget class="QLabel" name="executableVersionLabel"> <widget class="QLabel" name="executableVersionLabel">
<property name="text"> <property name="text">
<string>FV 3.0.0</string> <string>FV 3.0.0</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="5" column="0">
<widget class="QLabel" name="argumentsLabel"> <widget class="QLabel" name="argumentsLabel">
<property name="text"> <property name="text">
<string>Arguments:</string> <string>Arguments:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="5" column="1">
<widget class="QLineEdit" name="argumentsEdit"/> <widget class="QLineEdit" name="argumentsEdit"/>
</item> </item>
<item row="7" column="0"> <item row="6" column="0">
<widget class="QLabel" name="commentsLabel"> <widget class="QLabel" name="commentsLabel">
<property name="text"> <property name="text">
<string>Comments:</string> <string>Comments:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="6" column="1">
<widget class="QPlainTextEdit" name="commentsEdit"> <widget class="QPlainTextEdit" name="commentsEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -187,14 +177,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="7" column="0">
<widget class="QLabel" name="directoryLabel"> <widget class="QLabel" name="directoryLabel">
<property name="text"> <property name="text">
<string>Directory:</string> <string>Directory:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="7" column="1">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
<item> <item>
<widget class="QLabel" name="directoryPathLabel"> <widget class="QLabel" name="directoryPathLabel">
@ -212,14 +202,14 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="9" column="0"> <item row="8" column="0">
<widget class="QLabel" name="shortcutsLabel"> <widget class="QLabel" name="shortcutsLabel">
<property name="text"> <property name="text">
<string>Create shortcuts:</string> <string>Create shortcuts:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="8" column="1">
<layout class="QVBoxLayout" name="shortcutsLayout"> <layout class="QVBoxLayout" name="shortcutsLayout">
<item> <item>
<widget class="QCheckBox" name="desktopShortcutCheckBox"> <widget class="QCheckBox" name="desktopShortcutCheckBox">
@ -257,7 +247,6 @@
<tabstop>profilesListView</tabstop> <tabstop>profilesListView</tabstop>
<tabstop>addButton</tabstop> <tabstop>addButton</tabstop>
<tabstop>deleteButton</tabstop> <tabstop>deleteButton</tabstop>
<tabstop>accountEdit</tabstop>
<tabstop>nameEdit</tabstop> <tabstop>nameEdit</tabstop>
<tabstop>serverComboBox</tabstop> <tabstop>serverComboBox</tabstop>
<tabstop>executableBrowseButton</tabstop> <tabstop>executableBrowseButton</tabstop>