Enable compiler warnings
Fix all the unused variable warnings Disable incomplete translations Compile the translation files Add qt_* translations not part of Qt (from VirutalBox) git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@289 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
parent
4a64bd61e4
commit
e3dcd73b89
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -119,16 +119,19 @@ SET(keepassx_FORMS
|
|||
SET(keepassx_RESOURCES res/resources.qrc)
|
||||
|
||||
set(keepassx_TRANSLATIONS
|
||||
translations/keepassx-cs_CZ.ts
|
||||
# translations/keepassx-cs_CZ.ts
|
||||
translations/keepassx-de_DE.ts
|
||||
translations/keepassx-es_ES.ts
|
||||
translations/keepassx-fi_FI.ts
|
||||
translations/keepassx-fr_FR.ts
|
||||
translations/keepassx-gl_ES.ts
|
||||
translations/keepassx-it_IT.ts
|
||||
translations/keepassx-ja_JP.ts
|
||||
translations/keepassx-ru_RU.ts
|
||||
# translations/keepassx-ja_JP.ts
|
||||
# translations/keepassx-ru_RU.ts
|
||||
translations/keepassx-tr_TR.ts
|
||||
translations/qt_fi.ts
|
||||
translations/qt_it.ts
|
||||
translations/qt_tr.ts
|
||||
)
|
||||
|
||||
#IF( MINGW )
|
||||
|
|
|
@ -215,7 +215,7 @@ public:
|
|||
/*! Sets the index of a group amongst the children of its parent.
|
||||
This function can be used to sort the groups of the database in a specific order.
|
||||
\param index The new index of the group. The indices of the other groups which are affected by this operation will be automatically adjusted.*/
|
||||
virtual void setIndex(int index)=0;
|
||||
//virtual void setIndex(int index)=0;
|
||||
|
||||
/*! Tests the validity of the handle.
|
||||
\return TRUE if the handle is valid and FALSE if the handle is invalid e.g. because the associated group was deleted.*/
|
||||
|
|
|
@ -377,7 +377,7 @@ switch(FieldType)
|
|||
}
|
||||
|
||||
//! Extracts one group from raw decrypted data.
|
||||
bool Kdb3Database::readGroupField(StdGroup* group,QList<quint32>& Levels,quint16 FieldType, quint32 FieldSize, quint8 *pData)
|
||||
bool Kdb3Database::readGroupField(StdGroup* group,QList<quint32>& Levels,quint16 FieldType, quint8 *pData)
|
||||
{
|
||||
switch(FieldType)
|
||||
{
|
||||
|
@ -663,7 +663,7 @@ bool Kdb3Database::loadReal(QString filename, bool readOnly, bool differentEncod
|
|||
LOAD_RETURN_CLEANUP
|
||||
}
|
||||
|
||||
bRet = readGroupField(&group,Levels, FieldType, FieldSize, (quint8 *)pField);
|
||||
bRet = readGroupField(&group,Levels, FieldType, (quint8 *)pField);
|
||||
if ((FieldType == 0xFFFF) && (bRet == true)){
|
||||
Groups << group;
|
||||
CurGroup++; // Now and ONLY now the counter gets increased
|
||||
|
@ -823,8 +823,8 @@ void Kdb3Database::deleteGroup(IGroupHandle* group){
|
|||
deleteGroup(((GroupHandle*)group)->Group);
|
||||
}
|
||||
|
||||
void Kdb3Database::GroupHandle::setIndex(int index){
|
||||
/*
|
||||
void Kdb3Database::GroupHandle::setIndex(int index){
|
||||
quint32 ParentId=((GroupHandle*)parent())->Id;
|
||||
int Pos=pDB->getGroupListIndex(this);
|
||||
int NewPos=0;
|
||||
|
@ -857,9 +857,8 @@ void Kdb3Database::GroupHandle::setIndex(int index){
|
|||
NewIndex++;
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
bool Kdb3Database::convHexToBinaryKey(char* HexKey, char* dst){
|
||||
QString hex=QString::fromAscii(HexKey,64);
|
||||
|
@ -1397,7 +1396,7 @@ bool Kdb3Database::save(){
|
|||
|
||||
unsigned int pos=DB_HEADER_SIZE; // Skip the header, it will be written later
|
||||
|
||||
serializeGroups(Groups,buffer,pos);
|
||||
serializeGroups(buffer,pos);
|
||||
serializeEntries(saveEntries,buffer,pos);
|
||||
serializeEntries(UnknownMetaStreams,buffer,pos);
|
||||
serializeEntries(MetaStreams,buffer,pos);
|
||||
|
@ -1556,7 +1555,7 @@ void Kdb3Database::appendChildrenToGroupList(QList<StdGroup*>& list,StdGroup& gr
|
|||
}
|
||||
|
||||
|
||||
void Kdb3Database::serializeGroups(QList<StdGroup>& GroupList,char* buffer,unsigned int& pos){
|
||||
void Kdb3Database::serializeGroups(char* buffer,unsigned int& pos){
|
||||
quint16 FieldType;
|
||||
quint32 FieldSize;
|
||||
quint32 Flags=0; //unused
|
||||
|
|
|
@ -101,7 +101,7 @@ public:
|
|||
virtual IGroupHandle* parent();
|
||||
virtual QList<IGroupHandle*> children();
|
||||
virtual int index();
|
||||
virtual void setIndex(int index);
|
||||
//virtual void setIndex(int index);
|
||||
virtual int level();
|
||||
virtual bool expanded();
|
||||
virtual void setExpanded(bool IsExpanded);
|
||||
|
@ -201,14 +201,14 @@ private:
|
|||
void createCustomIconsMetaStream(StdEntry* e);
|
||||
void createGroupTreeStateMetaStream(StdEntry* e);
|
||||
bool readEntryField(StdEntry* entry, quint16 FieldType, quint32 FieldSize, quint8 *pData);
|
||||
bool readGroupField(StdGroup* group,QList<quint32>& Levels,quint16 FieldType, quint32 FieldSize, quint8 *pData);
|
||||
bool readGroupField(StdGroup* group,QList<quint32>& Levels,quint16 FieldType, quint8 *pData);
|
||||
bool createGroupTree(QList<quint32>& Levels);
|
||||
void createHandles();
|
||||
void invalidateHandle(StdEntry* entry);
|
||||
bool convHexToBinaryKey(char* HexKey, char* dst);
|
||||
quint32 getNewGroupId();
|
||||
void serializeEntries(QList<StdEntry>& EntryList,char* buffer,unsigned int& pos);
|
||||
void serializeGroups(QList<StdGroup>& GroupList,char* buffer,unsigned int& pos);
|
||||
void serializeGroups(char* buffer,unsigned int& pos);
|
||||
void appendChildrenToGroupList(QList<StdGroup*>& list,StdGroup& group);
|
||||
void appendChildrenToGroupList(QList<IGroupHandle*>& list,StdGroup& group);
|
||||
bool searchStringContains(const QString& search, const QString& string,bool Cs, bool RegExp);
|
||||
|
|
|
@ -86,6 +86,7 @@ void AutoTypeDlg::paintEvent(QPaintEvent* event){
|
|||
}
|
||||
|
||||
void AutoTypeDlg::resizeEvent(QResizeEvent* event){
|
||||
Q_UNUSED(event);
|
||||
createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("Auto-Type"),width());
|
||||
}
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "Kdb3Database.h"
|
||||
|
||||
|
||||
CDbSettingsDlg::CDbSettingsDlg(QWidget* parent,IDatabase* db, bool modal, Qt::WFlags fl)
|
||||
CDbSettingsDlg::CDbSettingsDlg(QWidget* parent,IDatabase* db, Qt::WFlags fl)
|
||||
: QDialog(parent,fl)
|
||||
{
|
||||
setupUi(this);
|
||||
|
|
|
@ -27,7 +27,7 @@ class CDbSettingsDlg : public QDialog, private Ui_DatabaseSettingsDlg
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
CDbSettingsDlg(QWidget* parent,IDatabase* db, bool modal = FALSE, Qt::WFlags fl = 0 );
|
||||
CDbSettingsDlg(QWidget* parent,IDatabase* db, Qt::WFlags fl = 0 );
|
||||
~CDbSettingsDlg();
|
||||
virtual void paintEvent(QPaintEvent *);
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include "TargetWindowDlg.h"
|
||||
#endif
|
||||
|
||||
CEditEntryDlg::CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* parent, bool modal, bool newEntry)
|
||||
CEditEntryDlg::CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* parent, bool newEntry)
|
||||
: QDialog(parent)
|
||||
{
|
||||
Q_ASSERT(_db);
|
||||
|
|
|
@ -28,7 +28,7 @@ class CEditEntryDlg : public QDialog, private Ui_EditEntryDialog
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* parent = 0, bool modal = FALSE, bool newEntry = FALSE);
|
||||
CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* parent = 0, bool newEntry = FALSE);
|
||||
~CEditEntryDlg();
|
||||
void InitGroupComboBox();
|
||||
static void saveAttachment(IEntryHandle* pEntry, QWidget* ParentWidget=NULL);
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include "EditGroupDlg.h"
|
||||
#include "SelectIconDlg.h"
|
||||
|
||||
CEditGroupDialog::CEditGroupDialog(IDatabase* database,IGroupHandle* Handle,QWidget* parent, bool modal, Qt::WFlags fl)
|
||||
CEditGroupDialog::CEditGroupDialog(IDatabase* database,IGroupHandle* Handle,QWidget* parent, Qt::WFlags fl)
|
||||
: QDialog(parent,fl)
|
||||
{
|
||||
setupUi(this);
|
||||
|
@ -40,7 +40,7 @@ CEditGroupDialog::CEditGroupDialog(IDatabase* database,IGroupHandle* Handle,QWid
|
|||
}
|
||||
|
||||
|
||||
CEditGroupDialog::CEditGroupDialog(IDatabase* database,CGroup* Group,QWidget* parent, bool modal, Qt::WFlags fl)
|
||||
CEditGroupDialog::CEditGroupDialog(IDatabase* database,CGroup* Group,QWidget* parent, Qt::WFlags fl)
|
||||
: QDialog(parent,fl)
|
||||
{
|
||||
setupUi(this);
|
||||
|
|
|
@ -27,8 +27,8 @@ class CEditGroupDialog : public QDialog, private Ui_EditGroupDialog
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
CEditGroupDialog(IDatabase*,IGroupHandle*,QWidget* parent = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
|
||||
CEditGroupDialog(IDatabase*,CGroup*,QWidget* parent = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
|
||||
CEditGroupDialog(IDatabase*,IGroupHandle*,QWidget* parent = 0, Qt::WFlags fl = 0 );
|
||||
CEditGroupDialog(IDatabase*,CGroup*,QWidget* parent = 0, Qt::WFlags fl = 0 );
|
||||
~CEditGroupDialog();
|
||||
virtual void showEvent(QShowEvent *event);
|
||||
private:
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
PasswordDialog::PasswordDialog(QWidget* parent,DlgMode mode,DlgFlags flags,const QString& filename)
|
||||
: QDialog(parent)
|
||||
{
|
||||
Q_UNUSED(flags);
|
||||
setupUi(this);
|
||||
Mode=mode;
|
||||
Filename=filename;
|
||||
|
@ -155,8 +156,8 @@ PasswordDialog::PasswordDialog(QWidget* parent,DlgMode mode,DlgFlags flags,const
|
|||
connect(buttonBox->button(QDialogButtonBox::Ok), SIGNAL( clicked() ), this, SLOT( OnOK() ) );
|
||||
connect(Button_Browse, SIGNAL( clicked() ), this, SLOT( OnButtonBrowse() ) );
|
||||
connect(Button_GenKeyFile,SIGNAL(clicked()),this,SLOT(OnGenKeyFile()));
|
||||
connect(Check_Password,SIGNAL(stateChanged(int)),this,SLOT(OnCheckBoxesChanged(int)));
|
||||
connect(Check_KeyFile,SIGNAL(stateChanged(int)),this,SLOT(OnCheckBoxesChanged(int)));
|
||||
connect(Check_Password,SIGNAL(stateChanged(int)),this,SLOT(OnCheckBoxesChanged()));
|
||||
connect(Check_KeyFile,SIGNAL(stateChanged(int)),this,SLOT(OnCheckBoxesChanged()));
|
||||
connect(Button_Back,SIGNAL(clicked()),this,SLOT(OnButtonBack()));
|
||||
if(!config->showPasswordsPasswordDlg())
|
||||
ChangeEchoModeDatabaseKey();
|
||||
|
@ -168,7 +169,7 @@ PasswordDialog::PasswordDialog(QWidget* parent,DlgMode mode,DlgFlags flags,const
|
|||
setMinimumSize(size());
|
||||
createBanner(&BannerPixmap,getPixmap("key"),BannerTitle,width());
|
||||
Button_Bookmarks->setIcon(getIcon("bookmark"));
|
||||
OnCheckBoxesChanged(0);
|
||||
OnCheckBoxesChanged();
|
||||
}
|
||||
|
||||
|
||||
|
@ -295,7 +296,7 @@ void PasswordDialog::OnOK(){
|
|||
done(Exit_Ok);
|
||||
}
|
||||
|
||||
void PasswordDialog::OnCheckBoxesChanged(int state){
|
||||
void PasswordDialog::OnCheckBoxesChanged(){
|
||||
Edit_Password->setEnabled(Check_Password->isChecked());
|
||||
Combo_KeyFile->setEnabled(Check_KeyFile->isChecked());
|
||||
Button_Browse->setEnabled(Check_KeyFile->isChecked());
|
||||
|
|
|
@ -62,7 +62,7 @@ class PasswordDialog : public QDialog, private Ui_PasswordDlg {
|
|||
void OnButtonBack();
|
||||
void ChangeEchoModeDatabaseKey();
|
||||
void OnBookmarkTriggered(QAction* action);
|
||||
void OnCheckBoxesChanged(int state);
|
||||
void OnCheckBoxesChanged();
|
||||
void done(int r);
|
||||
|
||||
private:
|
||||
|
|
|
@ -473,6 +473,7 @@ PassCharValidator::PassCharValidator(QObject* parent) : QValidator(parent) {
|
|||
}
|
||||
|
||||
QValidator::State PassCharValidator::validate(QString& input, int& pos) const {
|
||||
Q_UNUSED(pos);
|
||||
QSet<QChar> chars;
|
||||
|
||||
for (int i=0; i<input.size(); i++) {
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "dialogs/SelectIconDlg.h"
|
||||
|
||||
|
||||
CSelectIconDlg::CSelectIconDlg(IDatabase* database,int CurrentId,QWidget* parent, bool modal, Qt::WFlags fl):QDialog(parent,fl){
|
||||
CSelectIconDlg::CSelectIconDlg(IDatabase* database,int CurrentId,QWidget* parent, Qt::WFlags fl):QDialog(parent,fl){
|
||||
setupUi(this);
|
||||
db=database;
|
||||
Id=CurrentId;
|
||||
|
|
|
@ -27,7 +27,7 @@ class CSelectIconDlg:public QDialog, private Ui_SelectIconDlg{
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
CSelectIconDlg(IDatabase* db,int ImageID,QWidget* parent = 0, bool modal = false, Qt::WFlags fl = 0);
|
||||
CSelectIconDlg(IDatabase* db,int ImageID,QWidget* parent = 0, Qt::WFlags fl = 0);
|
||||
|
||||
private slots:
|
||||
void OnAddIcon();
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "SimplePasswordDlg.h"
|
||||
|
||||
SimplePasswordDialog::SimplePasswordDialog(QWidget* parent, bool modal, Qt::WFlags fl)
|
||||
SimplePasswordDialog::SimplePasswordDialog(QWidget* parent, Qt::WFlags fl)
|
||||
: QDialog(parent,fl)
|
||||
{
|
||||
setupUi(this);
|
||||
|
|
|
@ -28,7 +28,7 @@ class SimplePasswordDialog : public QDialog, private Ui_SimplePasswordDialog
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
SimplePasswordDialog(QWidget* parent = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
|
||||
SimplePasswordDialog(QWidget* parent = 0, Qt::WFlags fl = 0 );
|
||||
~SimplePasswordDialog();
|
||||
QString password;
|
||||
|
||||
|
|
|
@ -44,11 +44,11 @@ KeepassEntryView::KeepassEntryView(QWidget* parent):QTreeWidget(parent){
|
|||
updateColumns();
|
||||
header()->setSortIndicator(config->columnSort(), config->columnSortOrder());
|
||||
|
||||
connect(header(),SIGNAL(sectionResized(int,int,int)),this,SLOT(OnColumnResized(int,int,int)));
|
||||
connect(header(),SIGNAL(sectionResized(int,int,int)),this,SLOT(OnColumnResized()));
|
||||
connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(OnItemsChanged()));
|
||||
connect(&ClipboardTimer, SIGNAL(timeout()), this, SLOT(OnClipboardTimeOut()));
|
||||
connect(header(),SIGNAL(sectionClicked(int)),this,SLOT(OnHeaderSectionClicked(int)));
|
||||
connect(header(),SIGNAL(sectionMoved(int,int,int)),this,SLOT(OnColumnMoved(int,int,int)));
|
||||
connect(header(),SIGNAL(sectionMoved(int,int,int)),this,SLOT(OnColumnMoved()));
|
||||
Clipboard=QApplication::clipboard();
|
||||
ContextMenu=new QMenu(this);
|
||||
setAlternatingRowColors(config->alternatingRowColors());
|
||||
|
@ -260,7 +260,7 @@ void KeepassEntryView::OnNewEntry(){
|
|||
}
|
||||
else
|
||||
NewEntry=db->newEntry(CurrentGroup);
|
||||
CEditEntryDlg dlg(db,NewEntry,this,true,true);
|
||||
CEditEntryDlg dlg(db,NewEntry,this,true);
|
||||
if(!dlg.exec()){
|
||||
db->deleteLastEntry();
|
||||
}
|
||||
|
@ -473,9 +473,9 @@ void KeepassEntryView::updateIcons(){
|
|||
}
|
||||
|
||||
|
||||
void KeepassEntryView::setEntry(IEntryHandle* entry){
|
||||
/*void KeepassEntryView::setEntry(IEntryHandle* entry){
|
||||
|
||||
}
|
||||
}*/
|
||||
|
||||
void KeepassEntryView::updateColumns(){
|
||||
setColumnCount(0);
|
||||
|
@ -529,7 +529,7 @@ void KeepassEntryView::refreshItems(){
|
|||
updateEntry(Items.at(i));
|
||||
}
|
||||
|
||||
void KeepassEntryView::OnColumnMoved(int LogIndex,int OldVisIndex,int NewVisIndex){
|
||||
void KeepassEntryView::OnColumnMoved(){
|
||||
for(int i=0;i<header()->count();i++){
|
||||
ColumnOrder[columnListIndex(header()->logicalIndex(i))]=i;
|
||||
}
|
||||
|
@ -595,7 +595,7 @@ int KeepassEntryView::columnListIndex(int LogicalIndex){
|
|||
}
|
||||
|
||||
|
||||
void KeepassEntryView::OnColumnResized(int lindex, int Old, int New){
|
||||
void KeepassEntryView::OnColumnResized(){
|
||||
if(!AutoResizeColumns)return;
|
||||
for(int i=0;i<header()->count();i++){
|
||||
ColumnSizes[columnListIndex(i)]=header()->sectionSize(i);
|
||||
|
|
|
@ -47,7 +47,7 @@ class KeepassEntryView:public QTreeWidget{
|
|||
void setCurrentEntry(IEntryHandle* entry);
|
||||
inline IGroupHandle* getCurrentGroup() { return CurrentGroup; };
|
||||
private:
|
||||
void setEntry(IEntryHandle* entry);
|
||||
//void setEntry(IEntryHandle* entry);
|
||||
void updateEntry(EntryViewItem*);
|
||||
void editEntry(EntryViewItem*);
|
||||
void createItems(QList<IEntryHandle*>& entries);
|
||||
|
@ -73,7 +73,7 @@ class KeepassEntryView:public QTreeWidget{
|
|||
void mouseMoveEvent(QMouseEvent *event);
|
||||
|
||||
private slots:
|
||||
void OnColumnResized(int index,int OldSize, int NewSize);
|
||||
void OnColumnResized();
|
||||
void OnHeaderSectionClicked(int index);
|
||||
void OnGroupChanged(IGroupHandle* group);
|
||||
void OnShowSearchResults();
|
||||
|
@ -92,7 +92,7 @@ class KeepassEntryView:public QTreeWidget{
|
|||
void OnAutoType();
|
||||
#endif
|
||||
void removeDragItems();
|
||||
void OnColumnMoved(int LogIndex,int OldVisIndex,int NewVisIndex);
|
||||
void OnColumnMoved();
|
||||
void OnEditOpenUrl();
|
||||
void OnEditCopyUrl();
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ void KeepassGroupView::OnHideSearchResults(){
|
|||
|
||||
void KeepassGroupView::OnNewGroup(){
|
||||
CGroup NewGroup;
|
||||
CEditGroupDialog dlg(db,&NewGroup,parentWidget(),true);
|
||||
CEditGroupDialog dlg(db,&NewGroup,parentWidget());
|
||||
if(dlg.exec())
|
||||
createGroup(NewGroup.Title, NewGroup.Image, NULL);
|
||||
}
|
||||
|
@ -113,7 +113,7 @@ void KeepassGroupView::OnNewGroup(){
|
|||
void KeepassGroupView::OnNewSubgroup(){
|
||||
GroupViewItem* parent=(GroupViewItem*)currentItem();
|
||||
CGroup NewGroup;
|
||||
CEditGroupDialog dlg(db,&NewGroup,parentWidget(),true);
|
||||
CEditGroupDialog dlg(db,&NewGroup,parentWidget());
|
||||
if(dlg.exec())
|
||||
createGroup(NewGroup.Title, NewGroup.Image, parent);
|
||||
}
|
||||
|
@ -151,7 +151,7 @@ void KeepassGroupView::createGroup(const QString& title, quint32 image, GroupVie
|
|||
|
||||
void KeepassGroupView::OnEditGroup(){
|
||||
GroupViewItem* item=(GroupViewItem*)currentItem();
|
||||
CEditGroupDialog dlg(db,item->GroupHandle,parentWidget(),true);
|
||||
CEditGroupDialog dlg(db,item->GroupHandle,parentWidget());
|
||||
int r=dlg.exec();
|
||||
if(r){
|
||||
item->setIcon(0,db->icon(item->GroupHandle->image()));
|
||||
|
@ -212,6 +212,7 @@ void KeepassGroupView::dragEnterEvent ( QDragEnterEvent * event ){
|
|||
|
||||
|
||||
void KeepassGroupView::dragLeaveEvent ( QDragLeaveEvent * event ){
|
||||
Q_UNUSED(event);
|
||||
if(LastHoverItem){
|
||||
LastHoverItem->setBackgroundColor(0,QApplication::palette().color(QPalette::Base));
|
||||
LastHoverItem->setForeground(0,QBrush(QApplication::palette().color(QPalette::Text)));
|
||||
|
|
|
@ -68,6 +68,7 @@ void WaitAnimationWidget::refreshAnimation(){
|
|||
}
|
||||
|
||||
void WaitAnimationWidget::paintEvent(QPaintEvent* event){
|
||||
Q_UNUSED(event);
|
||||
if(timer.isActive()){
|
||||
QPainter painter(this);
|
||||
painter.setRenderHints(QPainter::Antialiasing,true);
|
||||
|
@ -82,6 +83,7 @@ void WaitAnimationWidget::paintEvent(QPaintEvent* event){
|
|||
}
|
||||
|
||||
void WaitAnimationWidget::resizeEvent(QResizeEvent* event){
|
||||
Q_UNUSED(event);
|
||||
float r;
|
||||
if(width()>height())
|
||||
r=height()/2;
|
||||
|
|
|
@ -342,8 +342,8 @@ QList<Translation> getAllTranslations(){
|
|||
QDir dir(paths[i]);
|
||||
QStringList TrFiles=dir.entryList(QStringList()<<"*.qm",QDir::Files);
|
||||
for (int j=0;j<TrFiles.size();j++){
|
||||
if (filename.exactMatch(TrFiles[j]) && tmpTranslator.load(TrFiles[j],paths[i]) &&
|
||||
!names.contains(filename.cap(1)))
|
||||
if (filename.exactMatch(TrFiles[j]) && TrFiles[j]!="keepassx-xx_XX.qm" &&
|
||||
tmpTranslator.load(TrFiles[j],paths[i]) && !names.contains(filename.cap(1)))
|
||||
{
|
||||
Translation t;
|
||||
t.nameCode = filename.cap(1);
|
||||
|
|
|
@ -172,10 +172,10 @@ void KeepassMainWindow::setupConnections(){
|
|||
|
||||
connect(ViewShowToolbarAction,SIGNAL(toggled(bool)),this,SLOT(OnViewShowToolbar(bool)));
|
||||
connect(ViewShowEntryDetailsAction,SIGNAL(toggled(bool)),this,SLOT(OnViewShowEntryDetails(bool)));
|
||||
connect(ViewHidePasswordsAction,SIGNAL(toggled(bool)), this, SLOT(OnUsernPasswVisibilityChanged(bool)));
|
||||
connect(ViewHideUsernamesAction,SIGNAL(toggled(bool)), this, SLOT(OnUsernPasswVisibilityChanged(bool)));
|
||||
connect(ViewHidePasswordsAction,SIGNAL(toggled(bool)), this, SLOT(OnUsernPasswVisibilityChanged()));
|
||||
connect(ViewHideUsernamesAction,SIGNAL(toggled(bool)), this, SLOT(OnUsernPasswVisibilityChanged()));
|
||||
|
||||
connect(menuColumns,SIGNAL(triggered(QAction*)),this,SLOT(OnColumnVisibilityChanged(QAction*)));
|
||||
connect(menuColumns,SIGNAL(triggered(QAction*)),this,SLOT(OnColumnVisibilityChanged()));
|
||||
connect(ViewToolButtonSize16Action,SIGNAL(toggled(bool)), this, SLOT(OnViewToolbarIconSize16(bool)));
|
||||
connect(ViewToolButtonSize22Action,SIGNAL(toggled(bool)), this, SLOT(OnViewToolbarIconSize22(bool)));
|
||||
connect(ViewToolButtonSize28Action,SIGNAL(toggled(bool)), this, SLOT(OnViewToolbarIconSize28(bool)));
|
||||
|
@ -1006,7 +1006,7 @@ void KeepassMainWindow::OnQuickSearch(){
|
|||
GroupView->showSearchResults();
|
||||
}
|
||||
|
||||
void KeepassMainWindow::OnColumnVisibilityChanged(QAction* action){
|
||||
void KeepassMainWindow::OnColumnVisibilityChanged(){
|
||||
EntryView->Columns[0]=ViewColumnsTitleAction->isChecked();
|
||||
EntryView->Columns[1]=ViewColumnsUsernameAction->isChecked();
|
||||
EntryView->Columns[2]=ViewColumnsUrlAction->isChecked();
|
||||
|
@ -1022,7 +1022,7 @@ void KeepassMainWindow::OnColumnVisibilityChanged(QAction* action){
|
|||
if(FileOpen) EntryView->refreshItems();
|
||||
}
|
||||
|
||||
void KeepassMainWindow::OnUsernPasswVisibilityChanged(bool value){
|
||||
void KeepassMainWindow::OnUsernPasswVisibilityChanged(){
|
||||
config->setHidePasswords(ViewHidePasswordsAction->isChecked());
|
||||
config->setHideUsernames(ViewHideUsernamesAction->isChecked());
|
||||
EntryView->refreshItems();
|
||||
|
@ -1150,13 +1150,13 @@ config->setShowEntryDetails(show);
|
|||
DetailView->setVisible(show);
|
||||
}
|
||||
|
||||
void KeepassMainWindow::OnItemExpanded(QTreeWidgetItem* item){
|
||||
/*void KeepassMainWindow::OnItemExpanded(QTreeWidgetItem* item){
|
||||
//((GroupViewItem*)item)->pGroup->UI_ItemIsExpanded=true;
|
||||
}
|
||||
|
||||
void KeepassMainWindow::OnItemCollaped(QTreeWidgetItem* item){
|
||||
//((GroupViewItem*)item)->pGroup->UI_ItemIsExpanded=false;
|
||||
}
|
||||
}*/
|
||||
|
||||
void KeepassMainWindow::OnGroupSelectionChanged(IGroupHandle* group){
|
||||
if(group)
|
||||
|
|
|
@ -63,8 +63,8 @@ class KeepassMainWindow : public QMainWindow, private Ui_MainWindow{
|
|||
void OnViewToolbarIconSize28(bool);
|
||||
void OnGroupSelectionChanged(IGroupHandle*);
|
||||
void OnQuickSearch();
|
||||
void OnColumnVisibilityChanged(QAction* action);
|
||||
void OnUsernPasswVisibilityChanged(bool hide);
|
||||
void OnColumnVisibilityChanged();
|
||||
void OnUsernPasswVisibilityChanged();
|
||||
void OnFileModified();
|
||||
void OnExtrasSettings();
|
||||
void OnExtrasPasswordGen();
|
||||
|
@ -72,8 +72,8 @@ class KeepassMainWindow : public QMainWindow, private Ui_MainWindow{
|
|||
//void OnExtrasTrashCan(); //TODO TrashCan
|
||||
void OnHelpAbout();
|
||||
//void OnHelpHandbook(); //TODO Handbook
|
||||
void OnItemExpanded(QTreeWidgetItem*);
|
||||
void OnItemCollaped(QTreeWidgetItem*);
|
||||
//void OnItemExpanded(QTreeWidgetItem*);
|
||||
//void OnItemCollaped(QTreeWidgetItem*);
|
||||
void OnShowSearchResults();
|
||||
void OnEntryChanged(SelectionState);
|
||||
void OnSysTrayActivated(QSystemTrayIcon::ActivationReason);
|
||||
|
|
47
src/src.pro
47
src/src.pro
|
@ -1,7 +1,9 @@
|
|||
|
||||
CONFIG = qt uic resources thread stl warn_off
|
||||
CONFIG = qt uic resources thread stl warn_on
|
||||
QT += xml
|
||||
|
||||
contains(QMAKE_CXX, g++) : QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
|
||||
|
||||
DEPENDPATH += crypto dialogs export forms import lib translations res
|
||||
INCLUDEPATH += . lib crypto plugins/interfaces export import dialogs
|
||||
|
||||
|
@ -113,7 +115,6 @@ isEqual(QMAKE_WIN32,1){
|
|||
# SOURCES += main_win32.cpp
|
||||
}
|
||||
|
||||
|
||||
INSTALLS += target data
|
||||
|
||||
contains(DEFINES,GLOBAL_AUTOTYPE){
|
||||
|
@ -122,7 +123,6 @@ contains(DEFINES,GLOBAL_AUTOTYPE){
|
|||
SOURCES += dialogs/AutoTypeDlg.cpp lib/AutoTypeTreeWidget.cpp dialogs/TargetWindowDlg.cpp
|
||||
}
|
||||
|
||||
|
||||
FORMS += forms/AboutDlg.ui \
|
||||
forms/AddBookmarkDlg.ui \
|
||||
forms/CalendarDlg.ui \
|
||||
|
@ -143,17 +143,23 @@ FORMS += forms/AboutDlg.ui \
|
|||
# forms/TrashCanDlg.ui \
|
||||
forms/WorkspaceLockedWidget.ui
|
||||
|
||||
TRANSLATIONS += translations/keepassx-cs_CZ.ts \
|
||||
translations/keepassx-de_DE.ts \
|
||||
TRANSLATIONS_KX = translations/keepassx-de_DE.ts \
|
||||
# translations/keepassx-cs_CZ.ts \
|
||||
translations/keepassx-es_ES.ts \
|
||||
translations/keepassx-fi_FI.ts \
|
||||
translations/keepassx-fr_FR.ts \
|
||||
translations/keepassx-gl_ES.ts \
|
||||
translations/keepassx-it_IT.ts \
|
||||
translations/keepassx-ja_JP.ts \
|
||||
translations/keepassx-ru_RU.ts \
|
||||
translations/keepassx-tr_TR.ts \
|
||||
translations/keepassx-xx_XX.ts
|
||||
# translations/keepassx-ja_JP.ts \
|
||||
# translations/keepassx-ru_RU.ts \
|
||||
translations/keepassx-tr_TR.ts
|
||||
|
||||
TRANSLATIONS_QT = translations/qt_fi.ts \
|
||||
translations/qt_it.ts \
|
||||
translations/qt_tr.ts
|
||||
|
||||
TRANSLATIONS = $$TRANSLATIONS_KX translations/keepassx-xx_XX.ts
|
||||
TRANSLATIONS_COMPILE = $$TRANSLATIONS_KX $$TRANSLATIONS_QT
|
||||
|
||||
HEADERS += main.h \
|
||||
global.h \
|
||||
|
@ -282,3 +288,26 @@ else {
|
|||
}
|
||||
|
||||
RESOURCES += res/resources.qrc
|
||||
|
||||
isEmpty(QMAKE_LRELEASE) {
|
||||
win32 {
|
||||
QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
|
||||
}
|
||||
else {
|
||||
QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt4
|
||||
!exists($$QMAKE_LRELEASE) : QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
|
||||
}
|
||||
}
|
||||
|
||||
exists($$QMAKE_LRELEASE) {
|
||||
updateqm.input = TRANSLATIONS_COMPILE
|
||||
updateqm.output = ../share/keepassx/i18n/${QMAKE_FILE_BASE}.qm
|
||||
updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ../share/keepassx/i18n/${QMAKE_FILE_BASE}.qm
|
||||
updateqm.CONFIG += no_link
|
||||
|
||||
QMAKE_EXTRA_COMPILERS += updateqm
|
||||
PRE_TARGETDEPS += compiler_updateqm_make_all
|
||||
}
|
||||
else {
|
||||
message("*** lrelease not found - can't compile translation files")
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue