thooge/keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 0.4 branch to trunk

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@319 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer
2009-06-20 15:18:24 +00:00
parent 82f4fc4749
commit 8ec1eeefa4
40 changed files with 2810 additions and 3407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dialogs/AboutDlg.cpp
View File

@@ -71,7 +71,7 @@ AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
Edit_License->setHtml(QString::fromUtf8(gpl.readAll()));
connect(ButtonBox, SIGNAL(accepted()), SLOT(close()));
connect(ButtonBox, SIGNAL(rejected()), SLOT(close()));
}
void AboutDialog::paintEvent(QPaintEvent *event){

11
src/dialogs/HelpDlg.cpp Normal file
View File

@@ -0,0 +1,11 @@
#include "HelpDlg.h"
HelpDlg::HelpDlg(QWidget* parent) : QDialog(parent) {
setupUi(this);
textBrowser->setSource(QUrl("qrc:/docs/index.html"));
buttonPrevious->setIcon(getIcon("go-previous"));
buttonNext->setIcon(getIcon("go-next"));
buttonFirst->setIcon(getIcon("go-home"));
showMaximized();
}

15
src/dialogs/HelpDlg.h Normal file
View File

@@ -0,0 +1,15 @@
#ifndef HELPDLG_H
#define HELPDLG_H
#include "ui_HelpDlg.h"
class HelpDlg : public QDialog, private Ui_HelpDlg
{
Q_OBJECT
public:
HelpDlg(QWidget* parent);
};
#endif // HELPDLG_H

12
src/dialogs/SelectIconDlg.cpp
View File

@@ -41,13 +41,17 @@ CSelectIconDlg::CSelectIconDlg(IDatabase* database,int CurrentId,QWidget* parent
void CSelectIconDlg::updateView(){
List->clear();
for(int i=0; i<db->numIcons(); i++){
QListWidgetItem* item;
QListWidgetItem* item = NULL;
if(i<BUILTIN_ICONS)
List->addItem(item=new QListWidgetItem(QIcon(db->icon(i)),QString::number(i)));
item = new QListWidgetItem(QIcon(db->icon(i)),QString::number(i));
else
if(!db->icon(i).isNull())
List->addItem(item=new QListWidgetItem(QIcon(db->icon(i)),"["+QString::number(i)+"]"));
item->setData(32,i);
item = new QListWidgetItem(QIcon(db->icon(i)),"["+QString::number(i)+"]");
if (item) {
item->setData(32,i);
List->addItem(item);
}
}
}

3
src/dialogs/SettingsDlg.cpp
View File

@@ -34,7 +34,6 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
connect(DialogButtons, SIGNAL( rejected() ), this, SLOT( OnCancel() ) );
connect(DialogButtons, SIGNAL( clicked(QAbstractButton*)), this, SLOT(OnOtherButton(QAbstractButton*)));
connect(CheckBox_ShowSysTrayIcon, SIGNAL( toggled(bool) ), CheckBox_CloseToTray, SLOT( setEnabled(bool) ) );
connect(CheckBox_ShowSysTrayIcon, SIGNAL( toggled(bool) ), CheckBox_MinimizeTray, SLOT( setEnabled(bool) ) );
connect(CheckBox_OpenLast, SIGNAL( toggled(bool) ), CheckBox_RememberLastKey, SLOT( setEnabled(bool) ) );
connect(CheckBox_OpenLast, SIGNAL( toggled(bool) ), CheckBox_StartMinimized, SLOT( setEnabled(bool) ) );
@@ -82,7 +81,6 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
CheckBox_OpenLast->setChecked(config->openLastFile());
CheckBox_RememberLastKey->setChecked(config->rememberLastKey());
CheckBox_ShowSysTrayIcon->setChecked(config->showSysTrayIcon());
CheckBox_CloseToTray->setChecked(config->minimizeToTray());
CheckBox_MinimizeTray->setChecked(config->minimizeTray());
CheckBox_StartMinimized->setChecked(config->startMinimized());
CheckBox_StartLocked->setChecked(config->startLocked());
@@ -235,7 +233,6 @@ void CSettingsDlg::apply(){
//General (1)
config->setShowSysTrayIcon(CheckBox_ShowSysTrayIcon->isChecked());
config->setMinimizeToTray(CheckBox_CloseToTray->isChecked());
config->setMinimizeTray(CheckBox_MinimizeTray->isChecked());
config->setStartMinimized(CheckBox_StartMinimized->isChecked());
config->setStartLocked(CheckBox_StartLocked->isChecked());