calculate
/
calculate-utils-2.2-install-gui
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added migrated users out. Fixed Bulgarian tranlations.

Browse Source
new_gui
Ivan Loskutov 14 years ago
parent 44fbdcea0d
commit 8e784f6358
6 changed files with 60 additions and 25 deletions
Show Stats Download Patch File Download Diff File

6
src/calculateconfig.cpp
Unescape View File

@ -31,10 +31,10 @@ bool CalculateConfig::getDefaultConfig()
// start cl-install -v and parse out // start cl-install -v and parse out
QProcess cl_install; QProcess cl_install;
qDebug() << "Start cl-install -v --xml --filter (os_install*|os_locale_lang|os_disk*|os_device*)"; qDebug() << "Start cl-install -v --xml --filter (os_install*|os_locale_lang|os_disk*|os_device*|cl_migrate_user)";
cl_install.start( cl_install.start(
"cl-install -v --xml --filter \"os_install*|os_locale_lang|*os_disk*|*os_device*\"" "cl-install -v --xml --filter \"os_install*|os_locale_lang|*os_disk*|*os_device*|cl_migrate_user\""
); );
if ( !cl_install.waitForStarted() ) if ( !cl_install.waitForStarted() )
@ -89,6 +89,8 @@ bool CalculateConfig::getDefaultConfig()
m_Config["def_os_install_disk_mount"] = m_Config["os_install_disk_mount"]; m_Config["def_os_install_disk_mount"] = m_Config["os_install_disk_mount"];
m_Config["def_os_install_disk_perform_format"] = m_Config["os_install_disk_perform_format"]; m_Config["def_os_install_disk_perform_format"] = m_Config["os_install_disk_perform_format"];
m_Config["def_cl_migrate_user"] = m_Config["cl_migrate_user"];
return true; return true;
} }

26
src/pageusers.cpp
Unescape View File

@ -31,7 +31,10 @@ PageUsers::PageUsers()
connect( m_edRootPswRep, SIGNAL(textChanged(QString)), this, SLOT(checkPasswords()) ); connect( m_edRootPswRep, SIGNAL(textChanged(QString)), this, SLOT(checkPasswords()) );
// add default guest user // add default guest user
m_lstUsers->addItem("guest"); m_migratedUsers = CalculateConfig::instance()->getValue("def_cl_migrate_user").toStringList();
if ( !m_migratedUsers.contains("guest") )
m_lstUsers->addItem("guest");
checkPasswords(); checkPasswords();
} }
@ -86,6 +89,13 @@ void PageUsers::setupUi()
m_lstUsers = new QListWidget; m_lstUsers = new QListWidget;
QFrame* hline2 = new QFrame;
hline2->setFrameShape(QFrame::HLine);
hline2->setFrameShadow(QFrame::Sunken);
m_labMigratedUsers = new QLabel("");
m_labMigratedUsers->setWordWrap(true);
QVBoxLayout* vbox_0 = new QVBoxLayout; QVBoxLayout* vbox_0 = new QVBoxLayout;
vbox_0->addLayout(hbox_0); vbox_0->addLayout(hbox_0);
vbox_0->addLayout(gbox_0); vbox_0->addLayout(gbox_0);
@ -94,7 +104,9 @@ void PageUsers::setupUi()
vbox_0->addLayout(hbox_users); vbox_0->addLayout(hbox_users);
vbox_0->addLayout(hbox_but); vbox_0->addLayout(hbox_but);
vbox_0->addWidget(m_lstUsers); vbox_0->addWidget(m_lstUsers);
//vbox_0->addStretch(); vbox_0->addWidget(hline2);
vbox_0->addWidget(m_labMigratedUsers);
// vbox_0->addStretch();
setLayout(vbox_0); setLayout(vbox_0);
@ -116,6 +128,9 @@ void PageUsers::retranslateUi()
m_lstUsers->setToolTip( tr("Added users.\nFor modifying user - double click it.") ); m_lstUsers->setToolTip( tr("Added users.\nFor modifying user - double click it.") );
m_labUsers->setText( tr("Create users:") ); m_labUsers->setText( tr("Create users:") );
if ( m_migratedUsers.size() > 0 )
m_labMigratedUsers->setText( tr("These user accounts will be migrated: ") + m_migratedUsers.join(", ") );
} }
void PageUsers::show() void PageUsers::show()
@ -125,7 +140,7 @@ void PageUsers::show()
m_edRootPsw->setEnabled(false); m_edRootPsw->setEnabled(false);
m_edRootPswRep->setEnabled(false); m_edRootPswRep->setEnabled(false);
m_pswState = true; m_pswState = true;
m_labMatch->setText( tr("Root password will be moved from current system.") ); m_labMatch->setText( "" ); //tr("Root password will be moved from current system.") );
} }
emit changeNext( m_pswState ); emit changeNext( m_pswState );
@ -146,7 +161,7 @@ void PageUsers::addUser()
UserInfo userInfo = userDlg->getUserInfo(); UserInfo userInfo = userDlg->getUserInfo();
if ( findUserName(userInfo) == -1 ) if ( findUserName(userInfo) == -1 && !m_migratedUsers.contains(userInfo.name) )
{ {
m_lstUserInfo << userInfo; m_lstUserInfo << userInfo;
m_lstUsers->addItem( userInfo.name ); m_lstUsers->addItem( userInfo.name );
@ -178,7 +193,8 @@ void PageUsers::delUser()
if (m_lstUserInfo.isEmpty()) if (m_lstUserInfo.isEmpty())
{ {
m_lstUsers->addItem("guest"); if ( !m_migratedUsers.contains("guest") )
m_lstUsers->addItem("guest");
} }
} }
updateConfig(); updateConfig();

3
src/pageusers.h
Unescape View File

@ -49,6 +49,9 @@ private:
QListWidget* m_lstUsers; QListWidget* m_lstUsers;
QLabel* m_labMigratedUsers;
bool m_pswState; bool m_pswState;
QList<UserInfo> m_lstUserInfo; QList<UserInfo> m_lstUserInfo;
QStringList m_migratedUsers;
}; };

30
translations/cl-install-gui_bg.ts
Unescape View File

@ -40,7 +40,7 @@
</message> </message>
<message> <message>
<source>Partition: </source> <source>Partition: </source>
<translation type="unfinished"></translation> <translation type="unfinished">Дял:</translation>
</message> </message>
<message> <message>
<source>none</source> <source>none</source>
@ -48,11 +48,11 @@
</message> </message>
<message> <message>
<source>Warning</source> <source>Warning</source>
<translation type="unfinished"></translation> <translation type="unfinished">Предупреждение</translation>
</message> </message>
<message> <message>
<source>Mount point must be not empty</source> <source>Mount point must be not empty</source>
<translation type="unfinished"></translation> <translation type="unfinished">Точка на монтиране не може да бъде празна</translation>
</message> </message>
<message> <message>
<source>Duplicate mount point %1</source> <source>Duplicate mount point %1</source>
@ -330,16 +330,17 @@
</message> </message>
<message> <message>
<source>Add a new mount point</source> <source>Add a new mount point</source>
<translation type="unfinished"></translation> <translation type="unfinished">Добавете нова точка на монтиране</translation>
</message> </message>
<message> <message>
<source>Remove a selected mount point</source> <source>Remove a selected mount point</source>
<translation type="unfinished"></translation> <translation type="unfinished">Премахнете избраната точка на монтиране</translation>
</message> </message>
<message> <message>
<source>Mount <source>Mount
point</source> point</source>
<translation type="unfinished"></translation> <translation type="unfinished">Точка на
монтиране</translation>
</message> </message>
<message> <message>
<source>File <source>File
@ -350,23 +351,24 @@ system</source>
<message> <message>
<source>Choose mount points for the installation. You need at least a root / partition. <source>Choose mount points for the installation. You need at least a root / partition.
To modify the mount point, double-click it.</source> To modify the mount point, double-click it.</source>
<translation type="unfinished"></translation> <translation type="unfinished">Изберете точка на монтиране за инсталацията. Минимално необходимо е да изберете дял за / .
За редактиране на създадена точка за монтиране, кликнете два пъти на нея.</translation>
</message> </message>
<message> <message>
<source>To continue You need to choose partition for mount point %1.</source> <source>To continue You need to choose partition for mount point %1.</source>
<translation type="unfinished"></translation> <translation type="unfinished">За да продължите изберете раздел за точка на монтиране %1</translation>
</message> </message>
<message> <message>
<source>Adding is not possible. All partitions is busy.</source> <source>Adding is not possible. All partitions is busy.</source>
<translation type="unfinished"></translation> <translation type="unfinished">Не може да се добави. Всички дялове вече се използват.</translation>
</message> </message>
<message> <message>
<source>Root partition can&apos;t be deleted</source> <source>Root partition can&apos;t be deleted</source>
<translation type="unfinished"></translation> <translation type="unfinished">Дял / не може да бъде изтрит.</translation>
</message> </message>
<message> <message>
<source>Migrated mount point can&apos;t be deleted. Use &apos;none&apos; for disabling migration.</source> <source>Migrated mount point can&apos;t be deleted. Use &apos;none&apos; for disabling migration.</source>
<translation type="unfinished"></translation> <translation type="unfinished">... точка за монтиране не може да бъде изтрита. Използвайте none в име на раздела за деактивиране на прехвърлянето.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -442,7 +444,7 @@ For modifying user - double click it.</source>
</message> </message>
<message> <message>
<source>Root password will be moved from current system.</source> <source>Root password will be moved from current system.</source>
<translation type="unfinished">Паролата за потребител root ще бъде преместена в текущата система.</translation> <translation type="obsolete">Паролата за потребител root ще бъде преместена в текущата система.</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -468,6 +470,10 @@ For modifying user - double click it.</source>
<source>Passwords do not match</source> <source>Passwords do not match</source>
<translation type="unfinished">Паролите не съвпадат</translation> <translation type="unfinished">Паролите не съвпадат</translation>
</message> </message>
<message>
<source>These user accounts will be migrated: </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PageWelcome</name> <name>PageWelcome</name>

13
translations/cl-install-gui_ru.ts
Unescape View File

@ -32,7 +32,7 @@
</message> </message>
<message> <message>
<source>OK</source> <source>OK</source>
<translation type="unfinished"></translation> <translation type="unfinished">OK</translation>
</message> </message>
<message> <message>
<source>Cancel</source> <source>Cancel</source>
@ -339,7 +339,8 @@
<message> <message>
<source>Mount <source>Mount
point</source> point</source>
<translation type="unfinished">Точка монтирования</translation> <translation type="unfinished">Точка
монтирования</translation>
</message> </message>
<message> <message>
<source>File <source>File
@ -442,7 +443,7 @@ For modifying user - double click it.</source>
</message> </message>
<message> <message>
<source>Root password will be moved from current system.</source> <source>Root password will be moved from current system.</source>
<translation>Пароль пользователя root будет перенесен из текущей системы.</translation> <translation type="obsolete">Пароль пользователя root будет перенесен из текущей системы.</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -468,6 +469,10 @@ For modifying user - double click it.</source>
<source>Passwords do not match</source> <source>Passwords do not match</source>
<translation>Пароли не совпадают</translation> <translation>Пароли не совпадают</translation>
</message> </message>
<message>
<source>These user accounts will be migrated: </source>
<translation type="unfinished">Эти аккаунты будут перенесены: </translation>
</message>
</context> </context>
<context> <context>
<name>PageWelcome</name> <name>PageWelcome</name>
@ -658,7 +663,7 @@ For modifying user - double click it.</source>
</message> </message>
<message> <message>
<source>OK</source> <source>OK</source>
<translation type="unfinished"></translation> <translation type="unfinished">ОК</translation>
</message> </message>
<message> <message>
<source>Cancel</source> <source>Cancel</source>

7
translations/cl-install-gui_uk.ts
Unescape View File

@ -40,7 +40,6 @@
</message> </message>
<message> <message>
<source>Cancel</source> <source>Cancel</source>
<translatorcomment>Отмена</translatorcomment>
<translation>Скасування</translation> <translation>Скасування</translation>
</message> </message>
<message> <message>
@ -498,7 +497,7 @@ For modifying user - double click it.</source>
<message> <message>
<source>Root password will be moved from current system.</source> <source>Root password will be moved from current system.</source>
<translatorcomment>Пароль пользователя root будет перенесен из текущей системы.</translatorcomment> <translatorcomment>Пароль пользователя root будет перенесен из текущей системы.</translatorcomment>
<translation>Пароль користувача root буде перенесений з поточної системи.</translation> <translation type="obsolete">Пароль користувача root буде перенесений з поточної системи.</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -529,6 +528,10 @@ For modifying user - double click it.</source>
<translatorcomment>Пароли не совпадают</translatorcomment> <translatorcomment>Пароли не совпадают</translatorcomment>
<translation>Паролі не збігаються</translation> <translation>Паролі не збігаються</translation>
</message> </message>
<message>
<source>These user accounts will be migrated: </source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PageWelcome</name> <name>PageWelcome</name>

Write Preview
Loading…
Cancel
Save