Added missing files for broken rev 133.
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@135 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
tarek_saidi
parent
91c9d1d940
commit
8aea7e5f78
|
|
@ -0,0 +1,185 @@
|
||||||
|
/***************************************************************************
|
||||||
|
* Copyright (C) 2005-2007 by Tarek Saidi *
|
||||||
|
* tarek.saidi@arcor.de *
|
||||||
|
* *
|
||||||
|
* Copyright (C) 2007 by Constantin "Dinosaur" Makshin *
|
||||||
|
* dinosaur-rus@users.sourceforge.net *
|
||||||
|
* *
|
||||||
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
* it under the terms of the GNU General Public License as published by *
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or *
|
||||||
|
* (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* This program is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with this program; if not, write to the *
|
||||||
|
* Free Software Foundation, Inc., *
|
||||||
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include "KpxConfig.h"
|
||||||
|
#include <Qt>
|
||||||
|
#include <QDir>
|
||||||
|
|
||||||
|
KpxConfig::KpxConfig(const QString& filePath) : settings(filePath,QSettings::IniFormat){
|
||||||
|
if (settings.contains("Options/GroupTreeRestore") && !settings.contains("Options/GroupTreeState")){
|
||||||
|
switch (settings.value("Options/GroupTreeRestore",1).toInt()){
|
||||||
|
case 0:
|
||||||
|
setGroupTreeState(RestoreLast);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 2:
|
||||||
|
setGroupTreeState(DoNothing);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
setGroupTreeState(ExpandAll);
|
||||||
|
}
|
||||||
|
settings.remove("Options/GroupTreeRestore");
|
||||||
|
}
|
||||||
|
if (urlCmd()=="<<default>>")
|
||||||
|
setUrlCmd(QString());
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned KpxConfig::fileDlgHistorySize(){
|
||||||
|
settings.beginGroup("FileDlgHistory");
|
||||||
|
unsigned res=static_cast<unsigned>(settings.childKeys().size());
|
||||||
|
settings.endGroup();
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QColor KpxConfig::stringToColor(const QString& str){
|
||||||
|
QStringList ints=str.split(',');
|
||||||
|
QColor res;
|
||||||
|
if (ints.count()>0)
|
||||||
|
res.setRed(ints.at(0).toInt());
|
||||||
|
if (ints.count()>1)
|
||||||
|
res.setGreen(ints.at(1).toInt());
|
||||||
|
if (ints.count()>2)
|
||||||
|
res.setBlue(ints.at(2).toInt());
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QBitArray KpxConfig::stringToBitArray(const QString& str, unsigned count){
|
||||||
|
QBitArray res(static_cast<int>(count));
|
||||||
|
if (static_cast<unsigned>(str.length())<count)
|
||||||
|
count=static_cast<unsigned>(str.length());
|
||||||
|
for (int i=0;i<static_cast<int>(count);i++){
|
||||||
|
QChar c=str.at(i);
|
||||||
|
if ((c=='1') || (c=='t') || (c=='y'))
|
||||||
|
res.setBit(i);
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
KpxConfig::GrpTreeState KpxConfig::stringToGrpTreeState(const QString& str){
|
||||||
|
GrpTreeState res=ExpandAll;
|
||||||
|
if (!str.compare("Restore",Qt::CaseInsensitive))
|
||||||
|
res=RestoreLast;
|
||||||
|
else if (!str.compare("None",Qt::CaseInsensitive))
|
||||||
|
res=DoNothing;
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<int> KpxConfig::stringToIntArray(const QString& str, unsigned count){
|
||||||
|
QStringList ints=str.split(',');
|
||||||
|
QList<int> res;
|
||||||
|
unsigned i,
|
||||||
|
intsCount=qMin(static_cast<unsigned>(ints.count()),count);
|
||||||
|
for (i=0;i<intsCount;i++)
|
||||||
|
res.append(ints.at(i).toInt());
|
||||||
|
for (;i<count;i++)
|
||||||
|
res.append(0);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
KpxConfig::IntegrPluginType KpxConfig::stringToIntegrPluginType(const QString& str){
|
||||||
|
IntegrPluginType res=NoIntegr;
|
||||||
|
if (!str.compare("KDE",Qt::CaseInsensitive))
|
||||||
|
res=KDE;
|
||||||
|
else if (!str.compare("Gnome",Qt::CaseInsensitive))
|
||||||
|
res=Gnome;
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
tKeyType KpxConfig::stringToKeyType(const QString& str){
|
||||||
|
tKeyType res=PASSWORD;
|
||||||
|
if (!str.compare("KeyFile",Qt::CaseInsensitive))
|
||||||
|
res=KEYFILE;
|
||||||
|
else if (!str.compare("Composite",Qt::CaseInsensitive))
|
||||||
|
res=BOTH;
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString KpxConfig::bitArrayToString(const QBitArray& bitArray){
|
||||||
|
QString res;
|
||||||
|
for (int i=0;i<bitArray.count();i++)
|
||||||
|
res.append(QString::number(bitArray.at(i)?1:0));
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString KpxConfig::grpTreeStateToString(GrpTreeState grpTreeState){
|
||||||
|
QString res;
|
||||||
|
switch (grpTreeState){
|
||||||
|
case RestoreLast:
|
||||||
|
res="Restore";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ExpandAll:
|
||||||
|
res="ExpandAll";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DoNothing:
|
||||||
|
res="None";
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString KpxConfig::intArrayToString(const QList<int>& intArray){
|
||||||
|
QString res;
|
||||||
|
if (!intArray.isEmpty())
|
||||||
|
{
|
||||||
|
res.setNum(intArray.first());
|
||||||
|
for (int i=1;i<intArray.count();i++)
|
||||||
|
res.append(QString(",%1").arg(intArray.at(i)));
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString KpxConfig::integrPluginTypeToString(IntegrPluginType integrPluginType){
|
||||||
|
QString res;
|
||||||
|
switch (integrPluginType){
|
||||||
|
case NoIntegr:
|
||||||
|
res="None";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case KDE:
|
||||||
|
res="KDE";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Gnome:
|
||||||
|
res="Gnome";
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString KpxConfig::keyTypeToString(tKeyType keyType){
|
||||||
|
QString res;
|
||||||
|
switch (keyType){
|
||||||
|
case PASSWORD:
|
||||||
|
res="Password";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case KEYFILE:
|
||||||
|
res="KeyFile";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case BOTH:
|
||||||
|
res="Composite";
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,155 @@
|
||||||
|
/***************************************************************************
|
||||||
|
* Copyright (C) 2005-2007 by Tarek Saidi *
|
||||||
|
* tarek.saidi@arcor.de *
|
||||||
|
* *
|
||||||
|
* Copyright (C) 2007 by Constantin "Dinosaur" Makshin *
|
||||||
|
* dinosaur-rus@users.sourceforge.net *
|
||||||
|
* *
|
||||||
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
* it under the terms of the GNU General Public License as published by *
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or *
|
||||||
|
* (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* This program is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with this program; if not, write to the *
|
||||||
|
* Free Software Foundation, Inc., *
|
||||||
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#ifndef _KPXCONFIG_H_
|
||||||
|
#define _KPXCONFIG_H_
|
||||||
|
|
||||||
|
#include "main.h"
|
||||||
|
#include <QBitArray>
|
||||||
|
#include <QByteArray>
|
||||||
|
#include <QColor>
|
||||||
|
#include <QList>
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
#if defined(Q_WS_MAC)
|
||||||
|
# define DEFAULT_MOUNT_DIR "/Volumes/"
|
||||||
|
#elif defined(Q_WS_X11)
|
||||||
|
# define DEFAULT_MOUNT_DIR "/media/"
|
||||||
|
#elif defined(Q_WS_WIN)
|
||||||
|
# define DEFAULT_MOUNT_DIR "/"
|
||||||
|
#else
|
||||||
|
# define DEFAULT_MOUNT_DIR QString()
|
||||||
|
#endif
|
||||||
|
|
||||||
|
class KpxConfig{
|
||||||
|
public:
|
||||||
|
enum IntegrPluginType{NoIntegr,KDE,Gnome};
|
||||||
|
enum GrpTreeState{DoNothing,RestoreLast,ExpandAll};
|
||||||
|
|
||||||
|
KpxConfig(const QString& filePath);
|
||||||
|
|
||||||
|
bool alternatingRowColors(){return settings.value("Options/AlternatingRowColors",true).toBool();}
|
||||||
|
QColor bannerColor1(){return stringToColor(settings.value("Options/BannerColor1","0,85,127").toString());}
|
||||||
|
QColor bannerColor2(){return stringToColor(settings.value("Options/BannerColor2","0,117,175").toString());}
|
||||||
|
QColor bannerTextColor(){return stringToColor(settings.value("Options/BannerTextColor","222,222,222").toString());}
|
||||||
|
int clipboardTimeOut(){return settings.value("Options/ClipboardTimeOut",20).toInt();}
|
||||||
|
QBitArray columns(){return stringToBitArray(settings.value("UI/Columns","11111000000").toString(),11);}
|
||||||
|
QList<int> columnOrder(){return stringToIntArray(settings.value("UI/ColumnOrder","100,100,100,100,100,100,100,100,100,100,100").toString(),11);}
|
||||||
|
QList<int> columnSizes(){return stringToIntArray(settings.value("UI/ColumnSizes","15,10,10,10,10,10,10,10,10,10,10").toString(),11);}
|
||||||
|
bool enableBookmarkMenu(){return settings.value("Options/EnableBookmarkMenu",true).toBool();}
|
||||||
|
QStringList fileDlgHistory(unsigned index){return settings.value(QString("FileDlgHistory/ENTRY%1").arg(index)).toStringList();}
|
||||||
|
GrpTreeState groupTreeState(){return stringToGrpTreeState(settings.value("Options/GroupTreeState").toString());}
|
||||||
|
bool hidePasswords(){return settings.value("UI/HidePasswords",true).toBool();}
|
||||||
|
bool hideUsernames(){return settings.value("UI/HideUsernames",true).toBool();}
|
||||||
|
QByteArray hSplitterPos(){return settings.value("UI/HSplitterPos").toByteArray();}
|
||||||
|
IntegrPluginType integrPlugin(){return stringToIntegrPluginType(settings.value("Options/IntegrPlugin").toString());}
|
||||||
|
QString langFile(){return settings.value("Options/LangFile").toString();}
|
||||||
|
QString lastFile(){return settings.value("Options/LastFile").toString();}
|
||||||
|
QString lastKeyLocation(){return settings.value("Options/LastKeyLocation").toString();}
|
||||||
|
tKeyType lastKeyType(){return stringToKeyType(settings.value("Options/LastKeyType").toString());}
|
||||||
|
QRect mainWindowGeometry(const QRect& defaultValue){return settings.value("UI/MainWindowGeometry",defaultValue).toRect();}
|
||||||
|
bool minimizeToTray(){return settings.value("Options/MinimizeToTray",false).toBool();}
|
||||||
|
QString mountDir(){return settings.value("Options/MountDir",DEFAULT_MOUNT_DIR).toString();}
|
||||||
|
bool openLastFile(){return settings.value("Options/OpenLastFile",true).toBool();}
|
||||||
|
QString pwGenCharList(){return settings.value("Options/PwGenCharList").toString();}
|
||||||
|
int pwGenLength(){return settings.value("Options/PwGenLength",25).toInt();}
|
||||||
|
QBitArray pwGenOptions(){return stringToBitArray(settings.value("Options/PwGenOptions","1111100001").toString(),10);}
|
||||||
|
bool rememberLastKey(){return settings.value("Options/RememberLastKey",true).toBool();}
|
||||||
|
bool saveFileDlgHistory(){return settings.value("Options/SaveFileDlgHistory",true).toBool();}
|
||||||
|
bool saveRelativePaths(){return settings.value("Options/SaveRelativePaths",true).toBool();}
|
||||||
|
QBitArray searchOptions(){return stringToBitArray(settings.value("Options/SearchOptions","001101111").toString(),9);}
|
||||||
|
bool showEntryDetails(){return settings.value("UI/ShowEntryDetails",true).toBool();}
|
||||||
|
bool showPasswords(){return settings.value("Options/ShowPasswords",false).toBool();}
|
||||||
|
bool showPasswordsPasswordDlg(){return settings.value("Options/ShowPasswordsPasswordDlg",false).toBool();}
|
||||||
|
bool showStatusbar(){return settings.value("UI/ShowStatusbar",true).toBool();}
|
||||||
|
bool showSysTrayIcon(){return settings.value("Options/ShowSysTrayIcon",false).toBool();}
|
||||||
|
bool showToolbar(){return settings.value("UI/ShowToolbar",true).toBool();}
|
||||||
|
int toolbarIconSize(){return settings.value("UI/ToolbarIconSize",16).toInt();}
|
||||||
|
QString urlCmd(){return settings.value("Options/UrlCmd").toString();}
|
||||||
|
QByteArray vSplitterPos(){return settings.value("UI/VSplitterPos").toByteArray();}
|
||||||
|
bool askBeforeDelete(){return settings.value("Options/AskBeforeDelete",true).toBool();}
|
||||||
|
|
||||||
|
void setAlternatingRowColors(bool value){settings.setValue("Options/AlternatingRowColors",value);}
|
||||||
|
void setBannerColor1(const QColor& value){settings.setValue("Options/BannerColor1",colorToString(value));}
|
||||||
|
void setBannerColor2(const QColor& value){settings.setValue("Options/BannerColor2",colorToString(value));}
|
||||||
|
void setBannerTextColor(const QColor& value){settings.setValue("Options/BannerTextColor",colorToString(value));}
|
||||||
|
void setClipboardTimeOut(int value){settings.setValue("Options/ClipboardTimeOut",value);}
|
||||||
|
void setColumns(const QBitArray& value){settings.setValue("UI/Columns",bitArrayToString(value));}
|
||||||
|
void setColumnOrder(const QList<int>& value){settings.setValue("UI/ColumnOrder",intArrayToString(value));}
|
||||||
|
void setColumnSizes(const QList<int>& value){settings.setValue("UI/ColumnSizes",intArrayToString(value));}
|
||||||
|
void setEnableBookmarkMenu(bool value){settings.setValue("Options/EnableBookmarkMenu",value);}
|
||||||
|
void setFileDlgHistory(unsigned index,const QStringList& value){settings.setValue(QString("FileDlgHistory/ENTRY%1").arg(index), value);}
|
||||||
|
void setGroupTreeState(GrpTreeState value){settings.setValue("Options/GroupTreeState",grpTreeStateToString(value));}
|
||||||
|
void setHidePasswords(bool value){settings.setValue("UI/HidePasswords",value);}
|
||||||
|
void setHideUsernames(bool value){settings.setValue("UI/HideUsernames",value);}
|
||||||
|
void setHSplitterPos(const QByteArray& value){settings.setValue("UI/HSplitterPos",value);}
|
||||||
|
void setIntegrPlugin(IntegrPluginType value){settings.setValue("Options/IntegrPlugin",integrPluginTypeToString(value));}
|
||||||
|
void setLangFile(const QString& value){settings.setValue("Options/LangFile",value);}
|
||||||
|
void setLastFile(const QString& value){settings.setValue("Options/LastFile",value);}
|
||||||
|
void setLastKeyLocation(const QString& value){settings.setValue("Options/LastKeyLocation",value);}
|
||||||
|
void setLastKeyType(tKeyType value){settings.setValue("Options/LastKeyType",keyTypeToString(value));}
|
||||||
|
void setMainWindowGeometry(const QRect& value){settings.setValue("UI/MainWindowGeometry",value);}
|
||||||
|
void setMinimizeToTray(bool value){settings.setValue("Options/MinimizeToTray",value);}
|
||||||
|
void setMountDir(const QString& value){settings.setValue("Options/MountDir",value);}
|
||||||
|
void setOpenLastFile(bool value){settings.setValue("Options/OpenLastFile",value);}
|
||||||
|
void setPwGenCharList(const QString& value){settings.setValue("Options/PwGenCharList",value);}
|
||||||
|
void setPwGenLength(int value){settings.setValue("Options/PwGenLength",value);}
|
||||||
|
void setPwGenOptions(const QBitArray& value){settings.setValue("Options/PwGenOptions",bitArrayToString(value));}
|
||||||
|
void setRememberLastKey(bool value){settings.setValue("Options/RememberLastKey",value);}
|
||||||
|
void setSaveFileDlgHistory(bool value){settings.setValue("Options/SaveFileDlgHistory",value);}
|
||||||
|
void setSaveRelativePaths(bool value){settings.setValue("Options/SaveRelativePaths",value);}
|
||||||
|
void setSearchOptions(const QBitArray& value){settings.setValue("Options/SearchOptions",bitArrayToString(value));}
|
||||||
|
void setShowEntryDetails(bool value){settings.setValue("UI/ShowEntryDetails",value);}
|
||||||
|
void setShowPasswords(bool value){settings.setValue("Options/ShowPasswords",value);}
|
||||||
|
void setShowPasswordsPasswordDlg(bool value){settings.setValue("Options/ShowPasswordsPasswordDlg",value);}
|
||||||
|
void setShowStatusbar(bool value){settings.setValue("UI/ShowStatusbar",value);}
|
||||||
|
void setShowSysTrayIcon(bool value){settings.setValue("Options/ShowSysTrayIcon",value);}
|
||||||
|
void setShowToolbar(bool value){settings.setValue("UI/ShowToolbar",value);}
|
||||||
|
void setToolbarIconSize(int value){settings.setValue("UI/ToolbarIconSize",value);}
|
||||||
|
void setUrlCmd(const QString& value){settings.setValue("Options/UrlCmd",value);}
|
||||||
|
void setVSplitterPos(const QByteArray& value){settings.setValue("UI/VSplitterPos",value);}
|
||||||
|
void setAskBeforeDelete(bool value){settings.setValue("Options/AskBeforeDelete",value);}
|
||||||
|
|
||||||
|
unsigned fileDlgHistorySize();
|
||||||
|
void clearFileDlgHistory(){settings.remove("FileDlgHistory");};
|
||||||
|
|
||||||
|
private:
|
||||||
|
QSettings settings;
|
||||||
|
|
||||||
|
QColor stringToColor(const QString& str);
|
||||||
|
QBitArray stringToBitArray(const QString& str, unsigned count);
|
||||||
|
GrpTreeState stringToGrpTreeState(const QString& str);
|
||||||
|
QList<int> stringToIntArray(const QString& str, unsigned count);
|
||||||
|
IntegrPluginType stringToIntegrPluginType(const QString& str);
|
||||||
|
tKeyType stringToKeyType(const QString& str);
|
||||||
|
|
||||||
|
QString colorToString(const QColor& color){return QString("%1,%2,%3").arg(color.red()).arg(color.green()).arg(color.blue());}
|
||||||
|
QString bitArrayToString(const QBitArray& bitArray);
|
||||||
|
QString grpTreeStateToString(GrpTreeState grpTreeState);
|
||||||
|
QString intArrayToString(const QList<int>& intArray);
|
||||||
|
QString integrPluginTypeToString(IntegrPluginType integrPluginType);
|
||||||
|
QString keyTypeToString(tKeyType keyType);
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
Loading…
Reference in New Issue