The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor changes

Browse Source 
- Add predefined templates to the list of templates
 - fix extension duplication bug in post 0.6.3 release
 - change Password dialog text properties
 - remove unused/duplicate code in lib/pki_key.cpp
This commit is contained in:
Christian Hohnstaedt 2007-08-13 13:53:30 +02:00
parent c9d476bd8e
commit deec9eb993
8 changed files with 136 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/db_temp.cpp
View File

@ -60,6 +60,31 @@ pki_base *db_temp::newPKI(){
return new pki_temp("");
}
QStringList db_temp::getDescPredefs()
{
QStringList x;
x.clear();
for(pki_temp *pki=(pki_temp*)predefs->iterate(); pki;
pki=(pki_temp*)pki->iterate()) {
x.append(QString("[default] ") + pki->getIntName());
}
x += getDesc();
return x;
}
pki_base *db_temp::getByName(QString desc)
{
if (!desc.startsWith("[default] "))
return db_base::getByName(desc);
desc.remove(0, 10); // "[default] "
for(pki_temp *pki=(pki_temp*)predefs->iterate(); pki;
pki=(pki_temp*)pki->iterate()) {
if (pki->getIntName() == desc)
return pki;
}
return NULL;
}
bool db_temp::runTempDlg(pki_temp *temp)
{
NewX509 *dlg = new NewX509(mainwin);

2
lib/db_temp.h
View File

@ -29,6 +29,8 @@ class db_temp: public db_base
bool runTempDlg(pki_temp *temp);
bool alterTemp(pki_temp *temp);
void showContextMenu(QContextMenuEvent *e, const QModelIndex &index);
pki_base *getByName(QString desc);
QStringList getDescPredefs();
public slots:
void newItem();

11
lib/pki_key.cpp
View File

@ -85,17 +85,6 @@ QString pki_key::getTypeString()
QString pki_key::getIntNameWithType()
{
QString postfix;
switch (key->type) {
case EVP_PKEY_RSA:
postfix = " (RSA)";
break;
case EVP_PKEY_DSA:
postfix = " (DSA)";
break;
default:
postfix = " (---)";
}
return getIntName() + " (" + getTypeString() + ")";
}

13
lib/x509v3ext.cpp
View File

@ -42,14 +42,15 @@ x509v3ext &x509v3ext::set(const X509_EXTENSION *n)
x509v3ext &x509v3ext::create(int nid, const QString &et, X509V3_CTX *ctx)
{
X509_EXTENSION *new_ext = NULL;
if (!et.isEmpty()) {
new_ext = X509V3_EXT_conf_nid(NULL, ctx, nid, (char*)CCHAR(et));
}
if (new_ext) {
if (ext) {
X509_EXTENSION_free(ext);
ext = new_ext;
ext = NULL;
}
if (!et.isEmpty()) {
ext = X509V3_EXT_conf_nid(NULL, ctx, nid, (char*)CCHAR(et));
}
if (!ext)
ext = X509_EXTENSION_new();
return *this;
}

8
ui/Makefile
View File

@ -4,17 +4,9 @@ TOPDIR=..
endif
UINAMES=$(patsubst %.ui, ui_%, $(wildcard *.ui))
#OBJS=$(patsubst %, moc_%.o, $(UINAMES)) $(patsubst %, %.o, $(UINAMES))
#MOC_CPP=$(patsubst %, moc_%.cpp, $(UINAMES))
#UI_CPP=$(patsubst %, %.cpp, $(UINAMES))
UI_H=$(patsubst %, %.h, $(UINAMES))
#DELFILES=$(MOC_CPP) $(UI_CPP) $(UI_H)
DELFILES=$(UI_H)
#EXTRA_CFLAGS+=-I../widgets -I../view
include ../Rules.mak
headers: $(UI_H)

92
ui/PassRead.ui
View File

@ -1,14 +1,11 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>PassRead</class>
<widget class="QDialog" name="PassRead" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>339</width>
<width>330</width>
<height>192</height>
</rect>
</property>
@ -16,20 +13,38 @@
<string>Password</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>8</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>8</number>
</property>
<property name="topMargin" >
<number>8</number>
</property>
<property name="rightMargin" >
<number>8</number>
</property>
<property name="bottomMargin" >
<number>8</number>
</property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="title" >
<property name="font" >
@ -87,35 +102,9 @@
</item>
<item>
<widget class="QLabel" name="description" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>32767</width>
<height>32767</height>
</size>
</property>
<property name="font" >
<font>
<family>Sans Serif</family>
<pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="text" >
<string/>
</property>
<property name="scaledContents" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
@ -127,12 +116,21 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>8</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>8</number>
</property>
<property name="topMargin" >
<number>8</number>
</property>
<property name="rightMargin" >
<number>8</number>
</property>
<property name="bottomMargin" >
<number>8</number>
</property>
<item>
<widget class="QLabel" name="TextLabel1" >
<property name="text" >
@ -152,12 +150,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="PushButton2" >
<property name="text" >
@ -192,7 +199,6 @@
</item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>pass</tabstop>
<tabstop>PushButton1</tabstop>

80
ui/PassWrite.ui
View File

@ -5,28 +5,46 @@
<rect>
<x>0</x>
<y>0</y>
<width>474</width>
<height>243</height>
<width>330</width>
<height>221</height>
</rect>
</property>
<property name="windowTitle" >
<string>Password</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>8</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>8</number>
</property>
<property name="topMargin" >
<number>8</number>
</property>
<property name="rightMargin" >
<number>8</number>
</property>
<property name="bottomMargin" >
<number>8</number>
</property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="title" >
<property name="font" >
@ -98,32 +116,29 @@
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>8</number>
</property>
<property name="spacing" >
<property name="topMargin" >
<number>8</number>
</property>
<property name="rightMargin" >
<number>8</number>
</property>
<property name="bottomMargin" >
<number>8</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<widget class="QLabel" name="TextLabel2" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>32767</width>
<height>32767</height>
</size>
</property>
<property name="text" >
<string>Repeat password</string>
</property>
<property name="scaledContents" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
@ -152,12 +167,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="PushButton2" >
<property name="text" >

2
widgets/NewX509.cpp
View File

@ -96,7 +96,7 @@ NewX509::NewX509(QWidget *parent)
// settings for the templates ....
strings.clear();
strings = MainWindow::temps->getDesc();
strings = MainWindow::temps->getDescPredefs();
tempList->insertItems(0, strings);
// setup Extended keyusage