diff --git a/COPYING b/COPYING index 99bb160..28b7278 100644 --- a/COPYING +++ b/COPYING @@ -328,63 +328,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/share/keepassx/license.html b/share/keepassx/license.html new file mode 100644 index 0000000..94696c0 --- /dev/null +++ b/share/keepassx/license.html @@ -0,0 +1,330 @@ +
Copyright (C) 2005-2007 Tarek Saidi <tarek.saidi@arcor.de>
+Copyright (C) 2007-2008 Felix Geyer <debfx-keepassx@fobos.de>
+
+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; version 2 of the license.
+
+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
+text of the GNU General Public License below for more details.
+
+
+Other licenses:
+
+apg/*:
+	Copyright (c) 1999, 2000, 2001, 2002, 2003 Adel I. Mirzazhanov
+	3-clause BSD license
+
+crypto/aes*:
+	Copyright (c) 1998-2008, Brian Gladman, Worcester
+	3-clause BSD license
+
+crypto/arcfour*:
+	Copyright (C) 2003-2008 Dominik Reichl <dominik.reichl@t-online.de>
+	GPLv2 or later
+
+crypto/blowfish*:
+	Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+	Copyright (C) 2003 by Michael Buesch
+	Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de>
+	GPLv2
+
+crypto/sha256*:
+	Copyright (C) 2001-2003 by Christophe Devine
+	Copyright (C) 2005-2006 by Tarek Saidi
+	GPLv2
+
+crypto/two*:
+	Copyright (C) 2005-2007 Tarek Saidi <tarek.saidi@arcor.de>
+	Copyright (c) 2003,2004 Dominik Reichl <dominik.reichl@t-online.de>
+	GPLv2
+
+crypto/yarrow*:
+	Copyright (C) 2007 Tarek Saidi <tarek.saidi@arcor.de>
+	Copyright (C) 2001 Niels Müler
+	GPLv2
+
+---------------------------------------------------------------------------
+			
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+               51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff --git a/src/KpxConfig.h b/src/KpxConfig.h index a6e18fb..b4f83ab 100644 --- a/src/KpxConfig.h +++ b/src/KpxConfig.h @@ -60,7 +60,6 @@ public: 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());} @@ -110,6 +109,7 @@ public: #endif //bool featureBookmarks(){return settings.value("Features/Bookmarks",true).toBool();} bool featureBookmarks(){return true;} + QString language(){return settings.value("Options/Language","auto").toString();} void setAlternatingRowColors(bool value){settings.setValue("Options/AlternatingRowColors",value);} void setBannerColor1(const QColor& value){settings.setValue("Options/BannerColor1",colorToString(value));} @@ -127,7 +127,6 @@ public: 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));} @@ -176,6 +175,7 @@ public: void setEntryTitlesMatch(bool value){settings.setValue("Options/EntryTitlesMatch",value);} #endif //void setFeatureBookmarks(bool value){settings.setValue("Features/Bookmarks",value);} + void setLanguage(const QString& value){settings.setValue("Options/Language",value);} unsigned fileDlgHistorySize(); void clearFileDlgHistory(){settings.remove("FileDlgHistory");}; diff --git a/src/dialogs/AboutDlg.cpp b/src/dialogs/AboutDlg.cpp index b3acc39..9dcc6d6 100644 --- a/src/dialogs/AboutDlg.cpp +++ b/src/dialogs/AboutDlg.cpp @@ -30,9 +30,9 @@ AboutDialog::AboutDialog(QWidget* parent):QDialog(parent) labelAppFunc->setText(QString(" - ").append(APP_LONG_FUNC)); QString AboutTr=QString("%1: %2

").arg(tr("Current Translation")).arg(tr("None","Please replace 'None' with the language of your translation")); - if(TrActive){ - AboutTr+=QString("%1: %2
").arg(tr("Author")).arg(tr("$TRANSLATION_AUTHOR")); - QString mail=tr("$TRANSLATION_AUTHOR_EMAIL","Here you can enter your email or homepage if you want."); + if(isTranslationActive()){ + AboutTr+=QString("%1: %2
").arg(tr("Author")).arg(QApplication::translate("Translation", "$TRANSLATION_AUTHOR")); + QString mail=QApplication::translate("Translation", "$TRANSLATION_AUTHOR_EMAIL","Here you can enter your email or homepage if you want."); if(!mail.isEmpty()){ AboutTr+=mail+"
"; } diff --git a/src/dialogs/SettingsDlg.cpp b/src/dialogs/SettingsDlg.cpp index a35fbe5..ee4c0b4 100644 --- a/src/dialogs/SettingsDlg.cpp +++ b/src/dialogs/SettingsDlg.cpp @@ -22,12 +22,14 @@ #include "dialogs/SettingsDlg.h" #include "dialogs/CustomizeDetailViewDlg.h" -bool CSettingsDlg::PluginsModified=false; +//bool CSettingsDlg::PluginsModified=false; CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog) { setupUi(this); + connect(listWidget, SIGNAL( currentRowChanged(int) ), stackedWidget, SLOT( setCurrentIndex(int) ) ); + connect(DialogButtons, SIGNAL( accepted() ), this, SLOT( OnOK() ) ); connect(DialogButtons, SIGNAL( rejected() ), this, SLOT( OnCancel() ) ); connect(DialogButtons, SIGNAL( clicked(QAbstractButton*)), this, SLOT(OnOtherButton(QAbstractButton*))); @@ -38,6 +40,8 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog) connect(CheckBox_OpenLast, SIGNAL( toggled(bool) ), CheckBox_StartMinimized, SLOT( setEnabled(bool) ) ); connect(CheckBox_OpenLast, SIGNAL( toggled(bool) ), CheckBox_StartLocked, SLOT( setEnabled(bool) ) ); + connect(listSelectLanguage, SIGNAL( currentRowChanged(int) ), SLOT( OnSelectLanguage(int) ) ); + connect(Button_ClearFileDlgHistory, SIGNAL(clicked()), &fileDlgHistory, SLOT(clear())); connect(ButtonColor1, SIGNAL( clicked() ), this, SLOT( OnColor1() ) ); connect(ButtonColor2, SIGNAL( clicked() ), this, SLOT( OnColor2() ) ); @@ -45,9 +49,9 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog) connect(Button_MountDirBrowse,SIGNAL(clicked()),this,SLOT(OnMountDirBrowse())); connect(Button_BrowserCmdBrowse,SIGNAL(clicked()),this,SLOT(OnBrowserCmdBrowse())); - connect(Radio_IntPlugin_None,SIGNAL(toggled(bool)),this,SLOT(OnIntPluginNone())); - connect(Radio_IntPlugin_Gnome,SIGNAL(toggled(bool)),this,SLOT(OnIntPluginGnome())); - connect(Radio_IntPlugin_Kde,SIGNAL(toggled(bool)),this,SLOT(OnIntPluginKde())); + //connect(Radio_IntPlugin_None,SIGNAL(toggled(bool)),this,SLOT(OnIntPluginNone())); + //connect(Radio_IntPlugin_Gnome,SIGNAL(toggled(bool)),this,SLOT(OnIntPluginGnome())); + //connect(Radio_IntPlugin_Kde,SIGNAL(toggled(bool)),this,SLOT(OnIntPluginKde())); connect(Button_CustomizeEntryDetails,SIGNAL(clicked()),this,SLOT(OnCustomizeEntryDetails())); connect(CheckBox_InactivityLock, SIGNAL(toggled(bool)), SLOT(OnInactivityLockChange(bool))); @@ -71,6 +75,8 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog) pShortcut = AutoType::shortcut; connect(this,SIGNAL(rejected()),SLOT(resetGlobalShortcut())); #endif + + listWidget->setCurrentRow(0); //General (1) CheckBox_OpenLast->setChecked(config->openLastFile()); @@ -121,8 +127,25 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog) color2=config->bannerColor2(); textcolor=config->bannerTextColor(); CheckBox_AlternatingRowColors->setChecked(config->alternatingRowColors()); - - + + //Language + translations = getAllTranslations(); + QString currentLang = config->language(); + bool foundCurrent = false; + for (int i=0; iaddItem(translations[i].nameLong); + if (translations[i].nameCode==currentLang){ + listSelectLanguage->setCurrentRow(i+2); + foundCurrent = true; + } + } + if (!foundCurrent){ + if (currentLang=="en_US") + listSelectLanguage->setCurrentRow(1); + else + listSelectLanguage->setCurrentRow(0); + } + //Security SpinBox_ClipboardTime->setValue(config->clipboardTimeOut()); CheckBox_ShowPasswords->setChecked(config->showPasswords()); @@ -132,12 +155,12 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog) SpinBox_InacitivtyTime->setValue(config->lockAfterSec()); //Features - tabWidgetSettings->removeTab(tabWidgetSettings->indexOf(tabFeatures)); + stackedWidget->removeWidget(pageFeatures); //CheckBox_FeatureBookmarks->setChecked(config->featureBookmarks()); // TODO Desktop Integration - tabWidgetSettings->removeTab(tabWidgetSettings->indexOf(tabIntegration)); + stackedWidget->removeWidget(pageDesktop); /*if(PluginLoadError==QString()) Label_IntPlugin_Error->hide(); else @@ -174,11 +197,10 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog) #endif adjustSize(); - resize( size() + QSize(50,20) ); + resize( size() + QSize(20,20) ); } -CSettingsDlg::~CSettingsDlg() -{ +CSettingsDlg::~CSettingsDlg(){ } void CSettingsDlg::paintEvent(QPaintEvent *event){ @@ -238,6 +260,21 @@ void CSettingsDlg::apply(){ config->setBannerTextColor(textcolor); config->setAlternatingRowColors(CheckBox_AlternatingRowColors->isChecked()); + //Language + int langIndex = listSelectLanguage->currentRow(); + QString oldLang = config->language(); + if (langIndex==0) + config->setLanguage("auto"); + else if (langIndex==1) + config->setLanguage("en_US"); + else + config->setLanguage(translations[langIndex-2].nameCode); + if (config->language() != oldLang){ + installTranslator(); + retranslateUi(this); + OnSelectLanguage(langIndex); + } + //Security config->setClipboardTimeOut(SpinBox_ClipboardTime->value()); config->setShowPasswords(CheckBox_ShowPasswords->isChecked()); @@ -327,7 +364,7 @@ void CSettingsDlg::OnBrowserCmdBrowse(){ } } -void CSettingsDlg::OnIntPluginNone(){ +/*void CSettingsDlg::OnIntPluginNone(){ Label_IntPlugin_Info->show(); } @@ -337,8 +374,7 @@ void CSettingsDlg::OnIntPluginGnome(){ void CSettingsDlg::OnIntPluginKde(){ Label_IntPlugin_Info->show(); -} - +}*/ void CSettingsDlg::OnCustomizeEntryDetails(){ CustomizeDetailViewDialog dlg(this); @@ -361,6 +397,24 @@ void CSettingsDlg::OnBackupDeleteChange(){ SpinBox_BackupDeleteAfter->setEnabled(CheckBox_Backup->isChecked() && CheckBox_BackupDelete->isChecked()); } +void CSettingsDlg::OnSelectLanguage(int index){ + if (index==0){ + labelLang->clear(); + labelAuthor->clear(); + } + else if (index==1){ + labelLang->setText("English (United States)"); + labelAuthor->setText("KeePassX Development Team"); + } + else{ + if (translations[index-2].nameLong != translations[index-2].nameEnglish) + labelLang->setText(QString("%1 / %2").arg(translations[index-2].nameLong).arg(translations[index-2].nameEnglish)); + else + labelLang->setText(translations[index-2].nameEnglish); + labelAuthor->setText(translations[index-2].author); + } +} + #ifdef GLOBAL_AUTOTYPE void CSettingsDlg::resetGlobalShortcut(){ AutoType::unregisterGlobalShortcut(); diff --git a/src/dialogs/SettingsDlg.h b/src/dialogs/SettingsDlg.h index 569d68e..64aa627 100644 --- a/src/dialogs/SettingsDlg.h +++ b/src/dialogs/SettingsDlg.h @@ -30,7 +30,7 @@ class CSettingsDlg : public QDialog, private Ui_SettingsDialog public: CSettingsDlg(QWidget* parent); ~CSettingsDlg(); - + private slots: virtual void OnCancel(); virtual void OnOK(); @@ -38,9 +38,9 @@ class CSettingsDlg : public QDialog, private Ui_SettingsDialog virtual void OnColor2(); virtual void OnColor1(); void OnOtherButton(QAbstractButton*); - void OnIntPluginNone(); + /*void OnIntPluginNone(); void OnIntPluginGnome(); - void OnIntPluginKde(); + void OnIntPluginKde();*/ void OnMountDirBrowse(); void OnBrowserCmdBrowse(); void OnCustomizeEntryDetails(); @@ -48,6 +48,7 @@ class CSettingsDlg : public QDialog, private Ui_SettingsDialog void OnAutoSaveToggle(bool checked); void OnAutoSaveChangeToggle(bool checked); void OnBackupDeleteChange(); + void OnSelectLanguage(int index); #ifdef GLOBAL_AUTOTYPE private slots: @@ -60,10 +61,11 @@ class CSettingsDlg : public QDialog, private Ui_SettingsDialog void apply(); QColor color1,color2,textcolor; QPixmap BannerPixmap; + QList translations; #ifdef GLOBAL_AUTOTYPE Shortcut pShortcut; #endif - static bool PluginsModified; + //static bool PluginsModified; }; diff --git a/src/forms/AboutDlg.ui b/src/forms/AboutDlg.ui index a06e6b7..4e4d859 100644 --- a/src/forms/AboutDlg.ui +++ b/src/forms/AboutDlg.ui @@ -9,24 +9,6 @@ 305 - - - 0 - 0 - - - - - 419 - 305 - - - - - 419 - 305 - - About diff --git a/src/forms/SettingsDlg.ui b/src/forms/SettingsDlg.ui index 3ddb2d8..ae76fe5 100644 --- a/src/forms/SettingsDlg.ui +++ b/src/forms/SettingsDlg.ui @@ -5,8 +5,8 @@ 0 0 - 606 - 455 + 667 + 440 @@ -36,110 +36,95 @@ - - - QTabWidget::North - - - QTabWidget::Rounded - - - 0 - - - - - 0 - 0 - 584 - 321 - - - - General (1) - - + + + + + + 0 + 0 + + + + + 120 + 16777215 + + + + + 10 + + + + QListView { + show-decoration-selected: 1; +} + +QListView::item { + margin-top: 2px; + margin-bottom: 2px; +} + + + QAbstractItemView::SelectRows + - - - Show system tray icon - - + + General (1) + - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 25 - 10 - - - - - - - - false - - - Minimize to tray instead of taskbar - - - - + + General (2) + - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 25 - 10 - - - - - - - - false - - - Minimize to tray when clicking the main window's close button - - - - + + Appearance + - + + Language + + + + + Security + + + + + Advanced + + + + + + + + 0 + + + + + 0 + 0 + 521 + 331 + + + - + - Remember last opened file - - - Alt+Ö + Show system tray icon - + @@ -157,19 +142,19 @@ - + false - Remember last key type and location + Minimize to tray instead of taskbar - + @@ -187,19 +172,133 @@ - + false - Start minimized + Minimize to tray when clicking the main window's close button - + + + + + Remember last opened file + + + Alt+Ö + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 25 + 10 + + + + + + + + false + + + Remember last key type and location + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 25 + 10 + + + + + + + + false + + + Start minimized + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 25 + 10 + + + + + + + + false + + + Start locked + + + + + + + + + + + 6 + + + + + Save recent directories of file dialogs + + + @@ -210,449 +309,879 @@ - 25 - 10 + 10 + 20 - - - false - + - Start locked + Clear History Now + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - - 6 - - + - Save recent directories of file dialogs + Always ask before deleting entries or groups - Qt::Horizontal - - - QSizePolicy::Fixed + Qt::Vertical - 10 - 20 + 1 + 1 + + + + + + 0 + 0 + 521 + 331 + + + - + - Clear History Now + Save backups of modified entries into the 'Backup' group - + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 25 + 10 + + + + + + + + false + + + Delete backup entries older than: + + + + + + + false + + + + 0 + 0 + + + + 1 + + + 999 + + + + + + + days + + + + + + + + + Automatically save database on exit and workspace locking + + + + + + + Automatically save database after every change + + + + + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 1 + 1 - - - - - Always ask before deleting entries or groups - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - - 0 - 0 - 584 - 321 - - - - General (2) - - - - - - Save backups of modified entries into the 'Backup' group - - - - - + + + + + 0 + 0 + 521 + 331 + + + - - - Qt::Horizontal + + + Banner Color - - QSizePolicy::Fixed + + + 6 + + + + + 6 + + + + + Text Color: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + + 16777215 + 23 + + + + Change... + + + + + + + + + + + 0 + 0 + + + + Color 2: + + + + + + + + 0 + 0 + + + + + 23 + 23 + + + + + 23 + 23 + + + + + + + + + + + + 0 + 0 + + + + + 23 + 23 + + + + + 23 + 23 + + + + true + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + + 16777215 + 23 + + + + Change... + + + + + + + + + + + 0 + 0 + + + + + 23 + 23 + + + + + 23 + 23 + + + + true + + + + + + + + 0 + 0 + + + + + 0 + 23 + + + + + 16777215 + 23 + + + + C&hange... + + + Alt+H + + + + + + + + 0 + 0 + + + + Color 1: + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 40 + 20 + + + + + + + + + + + + + Alternating Row Colors + + + + + + + 6 + + + + + Customize Entry Detail View... + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + 6 + + + + + Group tree at start-up: + + + + + + + Restore last state + + + + + + + Expand all items + + + + + + + Do not expand any item + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical - 25 - 10 + 1 + 1 + + + + + + 0 + 0 + 521 + 331 + + + - - - false + + + + + QAbstractItemView::SelectRows + + + + System Language + + + + + English + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Language: + + + + + + + Author: + + + + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical - - Delete backup entries older than: + + + 1 + 1 + - + + + + + + + 0 + 0 + 521 + 331 + + + - - - false - + - + 0 0 - - 1 + + Show plain text passwords in: - - 999 - - - - - - - days - - - - - - - - - Automatically save database on exit and workspace locking - - - - - - - Automatically save database after every change - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - 0 - 0 - 584 - 321 - - - - Appea&rance - - - - 6 - - - - - Banner Color - - - - 6 - - - + - 6 + 0 - - + + - Text Color: - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - 23 - - - - - 16777215 - 23 - - - - Change... + Edit Entry Dialog - + Alt+O - - - - - 0 - 0 - - - - Color 2: - - - - - - - - 0 - 0 - - - - - 23 - 23 - - - - - 23 - 23 - - + + - + Database Key Dialog - - - - - 0 - 0 - - - - - 23 - 23 - - - - - 23 - 23 - - - - true - - + + + + + + + 6 + + + + + + 0 + 0 + + + + Clear clipboard after: + + + + + + + + 0 + 0 + + + + + 80 + 16777215 + + + + 50000 + + + 2 + + + + + + + seconds + + + + + + + + + Lock workspace when minimizing the main window + + + + + + + + + Lock database after inactivity of + + + + + + + false + + + + 0 + 0 + + + + + 80 + 16777215 + + + + 50000 + + + + + + + seconds + + + + + + + + + Qt::Vertical + + + + 1 + 1 + + + + + + + + + + 0 + 0 + 521 + 331 + + + + + + + Custom Browser Command + + + true + + + + - - - - - 0 - 0 - - - - - 0 - 23 - - - - - 16777215 - 23 - - + + - Change... - - - + Browse - - - - - 0 - 0 - - - - - 23 - 23 - - - - - 23 - 23 - - - - true - - - - - - - - 0 - 0 - - - - - 0 - 23 - - - - - 16777215 - 23 - + + + + + + + + + Media Root: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + The directory where storage devices like CDs and memory sticks are normally mounted. + + + + + + + Browse... + + + + + + + + + Enable this if you want to use your bookmarks and the last opened file independet from their absolute paths. This is especially useful when using KeePassX portably and therefore with changing mount points in the file system. + + + Save relative paths (bookmarks and last file) + + + + + + + Auto-Type Fine Tuning + + + + 6 + + + + + Time between the activation of an auto-type action by the user and the first simulated key stroke. - - C&hange... + + ms - - Alt+H + + 10000 - - - - 0 - 0 - - + - Color 1: + Pre-Gap: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + Qt::Horizontal - - QSizePolicy::Minimum - 40 @@ -661,640 +1190,228 @@ + + + + Key Stroke Delay: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Delay between two simulated key strokes. Increase this if Auto-Type is randomly skipping characters. + + + ms + + + 10000 + + + - - - - - - - - Alternating Row Colors - - - - - - - 6 - - - - - Customize Entry Detail View... - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 6 - - - + + + - Group tree at start-up: + Global Auto-Type Shortcut: - - - - Restore last state + + + + true - - - - Expand all items + + + + Qt::Horizontal - - - - - - Do not expand any item + + + 40 + 20 + - + - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - - 0 - 0 - 584 - 321 - - - - Security - - - - 6 - - - - - - 0 - 0 - - - - Show plain text passwords in: - - - - 0 - - - - - Edit Entry Dialog - - - Alt+O - - - - - - - Database Key Dialog - - - - - - - - - - 6 - - - - - - 0 - 0 - - + - Clear clipboard after: + Use entries' title to match the window for Global Auto-Type - - - - 0 - 0 - + + + Qt::Vertical - + - 80 - 16777215 + 1 + 1 - - 50000 - - - 2 - - - - - - - seconds - - + - - - - - Lock workspace when minimizing the main window - - - - - + + + + + 0 + 0 + 521 + 331 + + + - + - Lock database after inactivity of - - - - - - - false - - - - 0 - 0 - - - - - 80 - 16777215 - - - - 50000 + You can disable several features of KeePassX here according to your needs in order to keep the user interface slim. - - - - - - seconds + + true - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - - 0 - 0 - 584 - 321 - - - - Features - - - - - - You can disable several features of KeePassX here according to your needs in order to keep the user interface slim. - - - true - - - - - - - Bookmarks - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - - 0 - 0 - 584 - 321 - - - - Desktop Integration - - - - 6 - - - - - - 0 - 0 - - - - - - - true - - - - - - - - 0 - 0 - - - - Plug-Ins - - - - 6 - - - - - None - - - - - - - Gnome Desktop Integration (Gtk 2.x) - - - - - - - KDE 4 Desktop Integration - - - - - - - - - - 6 - - + - You need to restart the program before the changes take effect. + Bookmarks - + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 1 + 1 - - - - Configure... - - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - - 0 - 0 - 584 - 321 - - - - Advanced - - - - 6 - - - - - Custom Browser Command - - - true - - - - - - - - - Browse - - - - - - - - + + + + + 0 + 0 + 521 + 331 + + + - - - Media Root: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - The directory where storage devices like CDs and memory sticks are normally mounted. + + + + 0 + 0 + - - - - - - Browse... + + Plug-Ins - - - - - - - - Enable this if you want to use your bookmarks and the last opened file independet from their absolute paths. This is especially useful when using KeePassX portably and therefore with changing mount points in the file system. - - - Save relative paths (bookmarks and last file) - - - - - - - Auto-Type Fine Tuning - - - - 6 - - - - - Time between the activation of an auto-type action by the user and the first simulated key stroke. - - - ms - - - 10000 - - - - - - - Pre-Gap: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Key Stroke Delay: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Delay between two simulated key strokes. Increase this if Auto-Type is randomly skipping characters. - - - ms - - - 10000 + + + 6 - - - - - - - - - - - Global Auto-Type Shortcut: - + + + + None + + + + + + + Gnome Desktop Integration (Gtk 2.x) + + + + + + + KDE 4 Desktop Integration + + + + - - - true + + + 6 - + + + + You need to restart the program before the changes take effect. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Configure... + + + + - + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 1 + 1 - - - - - Use entries' title to match the window for Global Auto-Type - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - + + + + @@ -1317,7 +1434,7 @@ - tabWidgetSettings + listWidget CheckBox_ShowSysTrayIcon CheckBox_MinimizeTray CheckBox_CloseToTray @@ -1341,17 +1458,13 @@ Radio_GroupTreeRestore Radio_GroupTreeExpand Radio_GroupTreeDoNothing + listSelectLanguage CheckBox_ShowPasswords CheckBox_ShowPasswords_PasswordDlg SpinBox_ClipboardTime CheckBox_LockMinimize CheckBox_InactivityLock SpinBox_InacitivtyTime - CheckBox_FeatureBookmarks - Radio_IntPlugin_None - Radio_IntPlugin_Gnome - Radio_IntPlugin_Kde - IntPlugin_Button_Config Box_BrowserCmd Edit_BrowserCmd Button_BrowserCmdBrowse @@ -1362,6 +1475,11 @@ SpinBox_AutoTypeKeyStrokeDelay Edit_GlobalShortcut CheckBox_EntryTitlesMatch + CheckBox_FeatureBookmarks + Radio_IntPlugin_None + Radio_IntPlugin_Gnome + Radio_IntPlugin_Kde + IntPlugin_Button_Config DialogButtons diff --git a/src/import/Import_PwManager.cpp b/src/import/Import_PwManager.cpp index 7d4d0ce..6e022b4 100644 --- a/src/import/Import_PwManager.cpp +++ b/src/import/Import_PwManager.cpp @@ -132,7 +132,8 @@ bool Import_PwManager::parseXmlContent(char* content){ if(!groups.elementsByTagName("c"+QString::number(i)).item(0).isElement())return false; CurrGroup=groups.elementsByTagName("c"+QString::number(i)).item(0).toElement(); if(!CurrGroup.hasAttribute("n"))return false; - IGroupHandle* NewGroup=database->addGroup(&CGroup(),NULL); + CGroup tmpGroup; + IGroupHandle* NewGroup=database->addGroup(&tmpGroup,NULL); NewGroup->setTitle(CurrGroup.attribute("n")); int j=0; while(1){ diff --git a/src/lib/tools.cpp b/src/lib/tools.cpp index fc61aa6..88b6f6d 100644 --- a/src/lib/tools.cpp +++ b/src/lib/tools.cpp @@ -17,8 +17,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include #include +#include +#include +#include #if defined(Q_WS_X11) || defined(Q_WS_MAC) #include @@ -234,3 +236,131 @@ bool unlockPage(void* addr, int len){ return false; #endif } + +QTranslator* translator = new QTranslator(); +QTranslator* qtTranslator = new QTranslator(); +bool translatorActive = false; +bool qtTranslatorActive = false; + +bool loadTranslation(QTranslator* tr,const QString& prefix,const QString& loc,const QStringList& paths){ + for (int i=0;iload(prefix+loc+".qm",paths[i])) + return true; + } + + for (int i=0;iload(TrFiles[j],paths[i])) + return true; + } + } + } + return false; +} + +void deactivateTranslators(bool qtOnly=false){ + if (translatorActive && !qtOnly){ + QApplication::removeTranslator(translator); + translatorActive = false; + } + + if (qtTranslatorActive){ + QApplication::removeTranslator(qtTranslator); + qtTranslatorActive = false; + } +} + +void installTranslator(){ + QString language = config->language(); + if (language=="auto") + language = QLocale::system().name(); + + if (language.isEmpty() || language=="en_US"){ + deactivateTranslators(); + return; + } + + if (loadTranslation(translator,"keepassx-",language,QStringList() + << DataDir+"/i18n/" << HomeDir)) + { + if (!translatorActive){ + QApplication::installTranslator(translator); + translatorActive = true; + } + } + else{ + deactivateTranslators(); + return; + } + + if (loadTranslation(qtTranslator,"qt_",language,QStringList() + << QLibraryInfo::location(QLibraryInfo::TranslationsPath) + << DataDir+"/i18n/" << HomeDir)) + { + if (!qtTranslatorActive){ + QApplication::installTranslator(qtTranslator); + qtTranslatorActive = true; + } + } + else{ + deactivateTranslators(true); + } +} + +bool isTranslationActive(){ + return translatorActive; +} + +bool operator<(const Translation& t1, const Translation& t2){ + return t1.nameLong < t2.nameLong; +} + +QList getAllTranslations(){ + QTranslator tmpTranslator; + QList translations; + QSet names; + + QStringList paths = QStringList() << DataDir+"/i18n/" << HomeDir; + QRegExp filename("keepassx-([^_]{2}_[^\\.]{2}|[^\\.]{2})\\.qm"); + for (int i=0;i getAllTranslations(); #endif //TOOLS_H diff --git a/src/main.cpp b/src/main.cpp index 109d233..7de99e7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,9 +24,7 @@ #include "plugins/interfaces/IGnomeInit.h" -#include -#include -#include +//#include #include "mainwindow.h" #include "main.h" #if defined(Q_WS_X11) && defined(GLOBAL_AUTOTYPE) @@ -40,7 +38,6 @@ QString AppDir; QString HomeDir; QString DataDir; QString PluginLoadError; -bool TrActive; QString DetailViewTemplate; bool EventOccurred; bool EventOccurredBlock = false; @@ -118,7 +115,7 @@ int main(int argc, char **argv) } else{ qWarning(CSTR(QString("Could not load desktop integration plugin: File '%1' not found.").arg(LibName))); - PluginLoadError=QObject::tr("Could not locate library file."); + PluginLoadError=QApplication::translate("Main", "Could not locate library file."); } } #endif @@ -140,57 +137,14 @@ int main(int argc, char **argv) return 1; } - //Internationalization - QLocale loc; - if(!args.language().size()) - loc=QLocale::system(); - else - loc=QLocale(args.language()); - - QTranslator* translator = new QTranslator; - QTranslator* qtTranslator = new QTranslator; - - if(loadTranslation(translator,"keepassx-",loc.name(),QStringList() - << DataDir+"/i18n/" - << HomeDir)) - { - QApplication::installTranslator(translator); - TrActive=true; - } - else{ - if(loc.name()!="en_US") - qWarning(CSTR( - QString("Kpx: No Translation found for '%1 (%2)' using 'English (United States)'") - .arg(QLocale::languageToString(loc.language())) - .arg(QLocale::countryToString(loc.country())) - )); - delete translator; - TrActive=false; - } - - if(TrActive){ - if(loadTranslation(qtTranslator,"qt_",loc.name(),QStringList() - << QLibraryInfo::location(QLibraryInfo::TranslationsPath) - << DataDir+"/i18n/" - << HomeDir)) - QApplication::installTranslator(qtTranslator); - else{ - if(loc.name()!="en_US") - qWarning(CSTR( - QString("Qt: No Translation found for '%1 (%2)' using 'English (United States)'") - .arg(QLocale::languageToString(loc.language())) - .arg(QLocale::countryToString(loc.country())) - )); - delete qtTranslator; - } - } - DetailViewTemplate=config->detailViewTemplate(); loadImages(); KpxBookmarks::load(); initYarrow(); //init random number generator SecString::generateSessionKey(); + + installTranslator(); EventListener* eventListener = new EventListener(); app->installEventFilter(eventListener); @@ -221,21 +175,7 @@ void loadImages(){ } -bool loadTranslation(QTranslator* tr,const QString& prefix,const QString& loc,const QStringList& paths){ - for(int i=0;iload(prefix+loc+".qm",paths[i])) return true; - - for(int i=0;iload(TrFiles[j],paths[i]))return true; - } - } - } - return false; -} + CmdLineArgs::CmdLineArgs(){ @@ -250,19 +190,6 @@ bool CmdLineArgs::parse(const QStringList& argv){ Help=true; break; // break, because other arguments will be ignored anyway } - if(argv[i]=="-lang"){ - if(argv.size()==i+1){ - Error="Missing argument for '-lang'."; - return false; - } - if(argv[i+1].size() != 2 && argv[i+1].size() != 5 ){ - Error=QString("'%1' is not a valid language code.").arg(argv[i+1]); - return false; - } - Language=argv[i+1]; - i++; - continue; - } if(argv[i]=="-cfg"){ //already done in preparse() -> skip i++; @@ -308,16 +235,11 @@ bool CmdLineArgs::preparse(int argc,char** argv){ void CmdLineArgs::printHelp(){ cerr << "KeePassX " << APP_VERSION << endl; - cerr << "Usage: keepassx [Filename] [Options]" << endl; + cerr << "Usage: keepassx [filename] [options]" << endl; cerr << " -help This Help" << endl; cerr << " -cfg Use specified file for loading/saving the configuration." << endl; cerr << " -min Start minimized." << endl; cerr << " -lock Start locked." << endl; - cerr << " -lang Use specified language instead of systems default." << endl; - cerr << " is the ISO-639 language code with or without ISO-3166 country code" << endl; - cerr << " Examples: de German" << endl; - cerr << " de_CH German(Switzerland)" << endl; - cerr << " pt_BR Portuguese(Brazil)" << endl; } diff --git a/src/main.h b/src/main.h index 41835b1..423a3c5 100644 --- a/src/main.h +++ b/src/main.h @@ -22,7 +22,6 @@ QString findPlugin(const QString& filename); void loadImages(); -bool loadTranslation(QTranslator* tr,const QString& prefix,const QString& LocaleCode,const QStringList& SearchPaths); void initAppPaths(int argc, char **argv); class CmdLineArgs { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index daa8ef0..038f2c5 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1070,8 +1070,14 @@ void KeepassMainWindow::showEvent(QShowEvent* event){ } void KeepassMainWindow::OnExtrasSettings(){ + QString oldLang = config->language(); CSettingsDlg dlg(this); dlg.exec(); + if (config->language() != oldLang){ + retranslateUi(this); + EntryView->updateColumns(); + + } EntryView->setAlternatingRowColors(config->alternatingRowColors()); SysTray->setVisible(config->showSysTrayIcon());