mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-04-17 06:32:36 +02:00
2020-11-24 Fred Gleason <fredg@paravelsystems.com>
* Added 'E-Mail Address', 'Phone Number' and 'Local Auth' columns to the 'Users' list in the 'Rivendell User List' dialog in rdadmin(1). Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
parent
62ef7fd79f
commit
82a368fdca
@ -20635,3 +20635,6 @@
|
||||
2020-11-24 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Documented user-facing changes to the 'System-Wide Settings'
|
||||
dialog in rdadmin(1) in the Operations Guide.
|
||||
2020-11-24 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Added 'E-Mail Address', 'Phone Number' and 'Local Auth' columns
|
||||
to the 'Users' list in the 'Rivendell User List' dialog in rdadmin(1).
|
||||
|
||||
@ -287,6 +287,7 @@ EXTRA_DIST = admin.xpm\
|
||||
greencheckmark.png\
|
||||
greenball.xpm\
|
||||
greencheckmark.xpm\
|
||||
localuser.xpm\
|
||||
marker.xpm\
|
||||
mic16.png\
|
||||
mic16.xpm\
|
||||
|
||||
68
icons/localuser.xpm
Normal file
68
icons/localuser.xpm
Normal file
@ -0,0 +1,68 @@
|
||||
/* XPM */
|
||||
static const char * localuser_xpm[] = {
|
||||
"16 16 49 1",
|
||||
" c None",
|
||||
". c #888A85",
|
||||
"+ c #AFB0AD",
|
||||
"@ c #F3F3F2",
|
||||
"# c #FEFEFE",
|
||||
"$ c #F8F8F7",
|
||||
"% c #F9F9F9",
|
||||
"& c #FBFBFB",
|
||||
"* c #F3F4F3",
|
||||
"= c #F9FAF9",
|
||||
"- c #FBFCFB",
|
||||
"; c #F6F7F6",
|
||||
"> c #F5F6F5",
|
||||
", c #EBECEA",
|
||||
"' c #F0F1EF",
|
||||
") c #F5F4F3",
|
||||
"! c #F2F3F2",
|
||||
"~ c #EEEFEE",
|
||||
"{ c #E8E9E6",
|
||||
"] c #EEEFED",
|
||||
"^ c #EFEFEE",
|
||||
"/ c #EDEDEB",
|
||||
"( c #E9EBE9",
|
||||
"_ c #EEEEED",
|
||||
": c #E5E7E4",
|
||||
"< c #E7E9E6",
|
||||
"[ c #E8E9E7",
|
||||
"} c #E7E8E5",
|
||||
"| c #898B86",
|
||||
"1 c #ECEDEB",
|
||||
"2 c #E3E4E1",
|
||||
"3 c #E3E5E1",
|
||||
"4 c #EDEDEC",
|
||||
"5 c #92948F",
|
||||
"6 c #BABBB8",
|
||||
"7 c #8C8E89",
|
||||
"8 c #EDEEED",
|
||||
"9 c #E0E2DE",
|
||||
"0 c #BABCB7",
|
||||
"a c #9B9D98",
|
||||
"b c #8B8D88",
|
||||
"c c #9B9C98",
|
||||
"d c #B8BAB6",
|
||||
"e c #DFE0DD",
|
||||
"f c #668F72",
|
||||
"g c #248F42",
|
||||
"h c #3B8F53",
|
||||
"i c #EFF0EE",
|
||||
"j c #91938E",
|
||||
" .... ",
|
||||
" .+@##@+. ",
|
||||
" +#$%&%#+ ",
|
||||
" .@*@=-;>@. ",
|
||||
" .#,')>!~#. ",
|
||||
" .#{,]^/(#. ",
|
||||
" .@_:<[}~@. ",
|
||||
" |+#1234#+| ",
|
||||
" 56+@##@+65 ",
|
||||
" 7890abbcde87 ",
|
||||
" 7#ffffffff#7 ",
|
||||
" 7#gggggggg#7 ",
|
||||
" 7#hhhhhhhh#7 ",
|
||||
" 7#ffffffff#7 ",
|
||||
" 7i########i7 ",
|
||||
" jjjjjjjjjjjj "};
|
||||
@ -2,7 +2,7 @@
|
||||
//
|
||||
// List Rivendell Users
|
||||
//
|
||||
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
|
||||
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License version 2 as
|
||||
@ -34,6 +34,7 @@
|
||||
// Icons
|
||||
//
|
||||
#include "../icons/admin.xpm"
|
||||
#include "../icons/localuser.xpm"
|
||||
#include "../icons/user.xpm"
|
||||
|
||||
ListUsers::ListUsers(const QString &admin_name,QWidget *parent)
|
||||
@ -54,6 +55,7 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent)
|
||||
// Create Icons
|
||||
//
|
||||
list_admin_map=new QPixmap(admin_xpm);
|
||||
list_localuser_map=new QPixmap(localuser_xpm);
|
||||
list_user_map=new QPixmap(user_xpm);
|
||||
|
||||
//
|
||||
@ -96,9 +98,13 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent)
|
||||
list_users_view->setAllColumnsShowFocus(true);
|
||||
list_users_view->setItemMargin(5);
|
||||
list_users_view->addColumn("");
|
||||
list_users_view->addColumn(tr("USER NAME"));
|
||||
list_users_view->addColumn(tr("FULL NAME"));
|
||||
list_users_view->addColumn(tr("DESCRIPTION"));
|
||||
list_users_view->addColumn(tr("Login Name"));
|
||||
list_users_view->addColumn(tr("Full Name"));
|
||||
list_users_view->addColumn(tr("Description"));
|
||||
list_users_view->addColumn(tr("E-Mail Address"));
|
||||
list_users_view->addColumn(tr("Phone Number"));
|
||||
list_users_view->addColumn(tr("Local Auth"));
|
||||
list_users_view->setColumnAlignment(6,Qt::AlignCenter);
|
||||
QLabel *list_box_label=new QLabel(list_users_view,tr("&Users:"),this);
|
||||
list_box_label->setFont(labelFont());
|
||||
list_box_label->setGeometry(14,11,85,19);
|
||||
@ -280,7 +286,15 @@ void ListUsers::RefreshList()
|
||||
RDListViewItem *item;
|
||||
|
||||
list_users_view->clear();
|
||||
sql="select ADMIN_CONFIG_PRIV,LOGIN_NAME,FULL_NAME,DESCRIPTION from USERS";
|
||||
sql=QString("select ")+
|
||||
"ADMIN_CONFIG_PRIV,"+ // 00
|
||||
"LOGIN_NAME,"+ // 01
|
||||
"FULL_NAME,"+ // 02
|
||||
"DESCRIPTION,"+ // 03
|
||||
"EMAIL_ADDRESS,"+ // 04
|
||||
"PHONE_NUMBER,"+ // 05
|
||||
"LOCAL_AUTH "+ // 06
|
||||
"from USERS";
|
||||
q=new RDSqlQuery(sql);
|
||||
while (q->next()) {
|
||||
item=new RDListViewItem(list_users_view);
|
||||
@ -288,11 +302,19 @@ void ListUsers::RefreshList()
|
||||
item->setPixmap(0,*list_admin_map);
|
||||
}
|
||||
else {
|
||||
item->setPixmap(0,*list_user_map);
|
||||
if(q->value(6).toString()=="Y") {
|
||||
item->setPixmap(0,*list_localuser_map);
|
||||
}
|
||||
else {
|
||||
item->setPixmap(0,*list_user_map);
|
||||
}
|
||||
}
|
||||
item->setText(1,q->value(1).toString());
|
||||
item->setText(2,q->value(2).toString());
|
||||
item->setText(3,q->value(3).toString());
|
||||
item->setText(4,q->value(4).toString());
|
||||
item->setText(5,q->value(5).toString());
|
||||
item->setText(6,q->value(6).toString());
|
||||
}
|
||||
delete q;
|
||||
}
|
||||
@ -306,7 +328,10 @@ void ListUsers::RefreshItem(RDListViewItem *item)
|
||||
sql=QString("select ")+
|
||||
"ADMIN_CONFIG_PRIV,"+ // 00
|
||||
"FULL_NAME,"+ // 01
|
||||
"DESCRIPTION "+ // 02
|
||||
"DESCRIPTION,"+ // 02
|
||||
"EMAIL_ADDRESS,"+ // 03
|
||||
"PHONE_NUMBER,"+ // 04
|
||||
"LOCAL_AUTH "+ // 05
|
||||
"from USERS where "+
|
||||
"LOGIN_NAME=\""+RDEscapeString(item->text(1))+"\"";
|
||||
q=new RDSqlQuery(sql);
|
||||
@ -315,10 +340,18 @@ void ListUsers::RefreshItem(RDListViewItem *item)
|
||||
item->setPixmap(0,*list_admin_map);
|
||||
}
|
||||
else {
|
||||
item->setPixmap(0,*list_user_map);
|
||||
if(q->value(3).toString()=="Y") {
|
||||
item->setPixmap(0,*list_localuser_map);
|
||||
}
|
||||
else {
|
||||
item->setPixmap(0,*list_user_map);
|
||||
}
|
||||
}
|
||||
item->setText(2,q->value(1).toString());
|
||||
item->setText(3,q->value(2).toString());
|
||||
item->setText(4,q->value(3).toString());
|
||||
item->setText(5,q->value(4).toString());
|
||||
item->setText(6,q->value(5).toString());
|
||||
}
|
||||
delete q;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
//
|
||||
// List Rivendell Users
|
||||
//
|
||||
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
|
||||
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License version 2 as
|
||||
@ -57,10 +57,10 @@ class ListUsers : public RDDialog
|
||||
QPushButton *list_close_button;
|
||||
QString list_admin_name;
|
||||
QPixmap *list_admin_map;
|
||||
QPixmap *list_localuser_map;
|
||||
QPixmap *list_user_map;
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#endif // LIST_USERS_H
|
||||
|
||||
|
||||
@ -6185,15 +6185,15 @@ Stále ještě chcete pokračovat?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>DESCRIPTION</source>
|
||||
<translation>POPIS</translation>
|
||||
<translation type="obsolete">POPIS</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>USER NAME</source>
|
||||
<translation>UŽIVATELSKÉ JMÉNO</translation>
|
||||
<translation type="obsolete">UŽIVATELSKÉ JMÉNO</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>FULL NAME</source>
|
||||
<translation>CELÉ JMÉNO</translation>
|
||||
<translation type="obsolete">CELÉ JMÉNO</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Are you sure you want to delete user</source>
|
||||
@ -6219,6 +6219,30 @@ Stále ještě chcete pokračovat?</translation>
|
||||
<source>You cannot delete yourself!</source>
|
||||
<translation>Nemůžete vymazat sám sebe!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Login Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Full Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Description</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>E-Mail Address</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Phone Number</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Local Auth</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Login</name>
|
||||
|
||||
@ -5881,15 +5881,15 @@ Wollen Sie immernoch fortfahren?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>DESCRIPTION</source>
|
||||
<translation>BESCHREIBUNG</translation>
|
||||
<translation type="obsolete">BESCHREIBUNG</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>USER NAME</source>
|
||||
<translation>BENUTZERNAME</translation>
|
||||
<translation type="obsolete">BENUTZERNAME</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>FULL NAME</source>
|
||||
<translation>VOLLER NAME</translation>
|
||||
<translation type="obsolete">VOLLER NAME</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Are you sure you want to delete user</source>
|
||||
@ -5915,6 +5915,30 @@ Wollen Sie immernoch fortfahren?</translation>
|
||||
<source>You cannot delete yourself!</source>
|
||||
<translation>Die können sich nicht selbst löschen!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Login Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Full Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Description</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>E-Mail Address</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Phone Number</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Local Auth</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Login</name>
|
||||
|
||||
@ -6139,15 +6139,15 @@ Do you still want to proceed?</source>
|
||||
</message>
|
||||
<message>
|
||||
<source>DESCRIPTION</source>
|
||||
<translation>DESCRIPCIÓN</translation>
|
||||
<translation type="obsolete">DESCRIPCIÓN</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>USER NAME</source>
|
||||
<translation>NMBRE USUAR</translation>
|
||||
<translation type="obsolete">NMBRE USUAR</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>FULL NAME</source>
|
||||
<translation>NMBRE COMPLETO</translation>
|
||||
<translation type="obsolete">NMBRE COMPLETO</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Are you sure you want to delete user</source>
|
||||
@ -6173,6 +6173,30 @@ Do you still want to proceed?</source>
|
||||
<source>You cannot delete yourself!</source>
|
||||
<translation>¡Ud. no puede borrarse a sí mismo!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Login Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Full Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Description</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>E-Mail Address</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Phone Number</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Local Auth</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Login</name>
|
||||
|
||||
@ -4907,18 +4907,6 @@ Carts</source>
|
||||
<source>&Users:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>DESCRIPTION</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>USER NAME</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>FULL NAME</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Are you sure you want to delete user</source>
|
||||
<translation type="unfinished"></translation>
|
||||
@ -4941,6 +4929,30 @@ Carts</source>
|
||||
<source>You cannot delete yourself!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Login Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Full Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Description</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>E-Mail Address</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Phone Number</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Local Auth</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Login</name>
|
||||
|
||||
@ -5756,17 +5756,9 @@ Er du sikker på at du vil halda fram?</translation>
|
||||
<source>Delete User</source>
|
||||
<translation>Slett brukaren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>USER NAME</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>FULL NAME</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>DESCRIPTION</source>
|
||||
<translation type="unfinished">SKILDRING</translation>
|
||||
<translation type="obsolete">SKILDRING</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>This user is set as the default user for the following hosts:
|
||||
@ -5778,6 +5770,30 @@ Er du sikker på at du vil halda fram?</translation>
|
||||
<source>You must change this before deleting the user.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Login Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Full Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Description</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>E-Mail Address</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Phone Number</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Local Auth</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Login</name>
|
||||
|
||||
@ -5756,17 +5756,9 @@ Er du sikker på at du vil halda fram?</translation>
|
||||
<source>Delete User</source>
|
||||
<translation>Slett brukaren</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>USER NAME</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>FULL NAME</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>DESCRIPTION</source>
|
||||
<translation type="unfinished">SKILDRING</translation>
|
||||
<translation type="obsolete">SKILDRING</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>This user is set as the default user for the following hosts:
|
||||
@ -5778,6 +5770,30 @@ Er du sikker på at du vil halda fram?</translation>
|
||||
<source>You must change this before deleting the user.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Login Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Full Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Description</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>E-Mail Address</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Phone Number</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Local Auth</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Login</name>
|
||||
|
||||
@ -5849,15 +5849,15 @@ Você quer proceder?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>USER NAME</source>
|
||||
<translation>USUÁRIO</translation>
|
||||
<translation type="obsolete">USUÁRIO</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>FULL NAME</source>
|
||||
<translation>NOME COMPLETO</translation>
|
||||
<translation type="obsolete">NOME COMPLETO</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>DESCRIPTION</source>
|
||||
<translation>DESCRIÇÃO</translation>
|
||||
<translation type="obsolete">DESCRIÇÃO</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>&Users:</source>
|
||||
@ -5887,6 +5887,30 @@ Você quer proceder?</translation>
|
||||
<source>Are you sure you want to delete user</source>
|
||||
<translation>Tem certeza que quer deletar este Usuário?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Login Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Full Name</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Description</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>E-Mail Address</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Phone Number</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Local Auth</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Login</name>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user