Commit 2b1b21b6 authored by Philip Rinn's avatar Philip Rinn

Imported Upstream version 1.0.4

parent fb2daa03
Make sure you have read the [FAQ](FAQ.md)
Thank you for wanting to contribute to making QtPass awesome.
......@@ -47,7 +47,9 @@ fi
###I would like to donate!
* Time:
* Read [contributing](CONTRIBUTING.md) documentation.
* Fork, clone hack and send a pull request.
* Find an [issue](https://github.com/IJHack/qtpass/issues) to work on..
* Participate in our bug bounty, you submit an issue and help us fix it, I send you a bounty.
* Money:
IJhack takes donations in [bitcoin](https://blockchain.info/address/146dqz8zXn9iNZMv5s7JVqwZKjrmumHBfb)
......@@ -67,6 +67,8 @@ Planned features
Further reading
---------------
[Documentation](http://qtpass.org/)
[FAQ](FAQ.md) and [CONTRIBUTING](CONTRIBUTING.md) documentation.
[Documentation](https://qtpass.org/)
[Source code](https://github.com/IJHack/qtpass)
This diff is collapsed.
......@@ -11,16 +11,16 @@ namespace Ui {
struct UserInfo;
class Dialog;
class ConfigDialog;
}
class Dialog : public QDialog
class ConfigDialog : public QDialog
{
Q_OBJECT
public:
explicit Dialog(MainWindow *parent);
~Dialog();
explicit ConfigDialog(MainWindow *parent);
~ConfigDialog();
void setPassPath(QString);
void setGitPath(QString);
void setGpgPath(QString);
......@@ -102,7 +102,7 @@ private slots:
void on_checkBoxUseTemplate_clicked();
private:
QScopedPointer<Ui::Dialog> ui;
QScopedPointer<Ui::ConfigDialog> ui;
void setGroupBoxState();
QString selectExecutable();
QString selectFolder();
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<class>ConfigDialog</class>
<widget class="QDialog" name="ConfigDialog">
<property name="geometry">
<rect>
<x>0</x>
......@@ -496,6 +496,18 @@
<string>Template</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
......@@ -598,7 +610,7 @@ url</string>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<receiver>ConfigDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
......@@ -614,7 +626,7 @@ url</string>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<receiver>ConfigDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
......
......@@ -4,7 +4,7 @@
#include <QDebug>
#include <QMessageBox>
KeygenDialog::KeygenDialog(Dialog *parent) :
KeygenDialog::KeygenDialog(ConfigDialog *parent) :
QDialog(parent),
ui(new Ui::KeygenDialog)
{
......
......@@ -3,7 +3,7 @@
#include <QDialog>
#include <QCloseEvent>
#include "dialog.h"
#include "configdialog.h"
namespace Ui {
class KeygenDialog;
......@@ -14,7 +14,7 @@ class KeygenDialog : public QDialog
Q_OBJECT
public:
explicit KeygenDialog(Dialog *parent = 0);
explicit KeygenDialog(ConfigDialog *parent = 0);
~KeygenDialog();
protected:
......@@ -32,7 +32,7 @@ private:
void replace(QString, QString);
void done(int r);
void no_protection(bool enable);
Dialog *dialog;
ConfigDialog *dialog;
};
......
This diff is collapsed.
No preview for this file type
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -35,8 +35,11 @@ int main(int argc, char *argv[])
QTranslator translator;
QString locale = QLocale::system().name();
//locale = "nl_NL";
//locale = "he_IL";
//locale = "ar_MA";
translator.load(QString(":localization/localization_") + locale + QString(".qm"));
app.installTranslator(&translator);
app.setLayoutDirection(QObject::tr("LTR")=="RTL" ? Qt::RightToLeft : Qt::LeftToRight);
MainWindow w;
......
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "dialog.h"
#include "configdialog.h"
#include "usersdialog.h"
#include "keygendialog.h"
#include "passworddialog.h"
......@@ -357,7 +357,7 @@ bool MainWindow::checkConfig() {
* @brief MainWindow::config
*/
void MainWindow::config() {
QScopedPointer<Dialog> d(new Dialog(this));
QScopedPointer<ConfigDialog> d(new ConfigDialog(this));
d->setModal(true);
// Automatically default to pass if it's available
......
......@@ -2,9 +2,9 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "QtPass"
#define MyAppVersion "1.0.3"
#define MyAppVersion "1.0.4"
#define MyAppPublisher "IJhack"
#define MyAppURL "http://qtpass.org/"
#define MyAppURL "https://qtpass.org/"
#define MyAppExeName "qtpass.exe"
[Setup]
......@@ -21,7 +21,7 @@ AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName}
DefaultGroupName={#MyAppName}
LicenseFile=C:\Users\IEUser\Desktop\QtPass\LICENSE.txt
LicenseFile=..\..\Desktop\QtPass\LICENSE.txt
OutputBaseFilename=setup
Compression=lzma
SolidCompression=yes
......@@ -60,14 +60,14 @@ Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
Source: "C:\Users\IEUser\Desktop\QtPass\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\README.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\icudt53.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\icuin53.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\icuuc53.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\icudt54.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\icuin54.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\icuuc54.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\libgcc_s_dw2-1.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\libstdc++-6.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\Desktop\QtPass\libwinpthread-1.dll"; DestDir: "{app}"; Flags: ignoreversion
......
#-------------------------------------------------
#
# QtPass is a GUI for pass,
# the standard unix password manager.
#
# Project created by QtCreator 2014-07-30T21:56:15
#
#-------------------------------------------------
VERSION = 1.0.3
#----------------------------------------------------------
# #
# QtPass is a GUI for pass, #
# the standard unix password manager. #
# #
# Project started by Anne Jan Brouwer 2014-07-30T21:56:15 #
# #
#----------------------------------------------------------
VERSION = 1.0.4
TEMPLATE = app
QT += core gui
isEmpty(QMAKE_LRELEASE) {
win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
unix {
!exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
} else {
!exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
}
}
updateqm.input = TRANSLATIONS
updateqm.output = localization/${QMAKE_FILE_BASE}.qm
updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm localization/${QMAKE_FILE_BASE}.qm
updateqm.CONFIG += no_link target_predeps
QMAKE_EXTRA_COMPILERS += updateqm
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
macx {
......@@ -22,30 +38,30 @@ macx {
SOURCES += main.cpp\
mainwindow.cpp \
dialog.cpp \
configdialog.cpp \
storemodel.cpp \
util.cpp \
usersdialog.cpp \
keygendialog.cpp \
progressindicator.cpp \
trayicon.cpp \
passworddialog.cpp
passworddialog.cpp
HEADERS += mainwindow.h \
dialog.h \
configdialog.h \
storemodel.h \
util.h \
usersdialog.h \
keygendialog.h \
progressindicator.h \
trayicon.h \
passworddialog.h
passworddialog.h
FORMS += mainwindow.ui \
dialog.ui \
configdialog.ui \
usersdialog.ui \
keygendialog.ui \
passworddialog.ui
passworddialog.ui
QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
......@@ -67,7 +83,8 @@ TRANSLATIONS += localization/localization_nl_NL.ts \
localization/localization_pl_PL.ts \
localization/localization_ru_RU.ts \
localization/localization_he_IL.ts \
localization/localization_zh_CN.ts
localization/localization_zh_CN.ts \
localization/localization_ar_MA.ts
CODECFORSRC = UTF-8
CODECFORTR = UTF-8
......@@ -85,8 +102,9 @@ win32 {
} else:macx {
ICON = artwork/icon.icns
QMAKE_INFO_PLIST = Info.plist
} else:bsd {
LIBS += -L/usr/local/lib
}
OTHER_FILES += LICENSE \
README.md
......@@ -99,6 +117,6 @@ isEmpty(PREFIX) {
}
target.path = $$PREFIX/
INSTALLS += target
INSTALLS += target
DEFINES += "VERSION=\"\\\"$$VERSION\\\"\""
qmake CONFIG+=release && make && macdeployqt QtPass.app -dmg
qmake CONFIG+=release && make && macdeployqt QtPass.app && appdmg appdmg.json QtPass.dmg
<RCC>
<qresource prefix="/">
<file>artwork/icon.icns</file>
<file>artwork/icon.ico</file>
<file>artwork/icon.png</file>
<file>artwork/icon.svg</file>
<file>localization/localization_ar_MA.qm</file>
<file>localization/localization_ar_MA.ts</file>
<file>localization/localization_de_DE.qm</file>
<file>localization/localization_de_DE.ts</file>
<file>localization/localization_es_ES.qm</file>
......@@ -16,10 +22,6 @@
<file>localization/localization_pl_PL.ts</file>
<file>localization/localization_ru_RU.qm</file>
<file>localization/localization_ru_RU.ts</file>
<file>artwork/icon.icns</file>
<file>artwork/icon.ico</file>
<file>artwork/icon.png</file>
<file>artwork/icon.svg</file>
<file>localization/localization_zh_CN.qm</file>
<file>localization/localization_zh_CN.ts</file>
<file>localization/localization_he_IL.ts</file>
......
......@@ -7,6 +7,7 @@
#ifdef Q_OS_WIN
#include <windows.h>
#endif
#include <sys/time.h>
QProcessEnvironment Util::_env;
bool Util::_envInitialised;
......@@ -44,7 +45,11 @@ QString Util::findPasswordStore()
if (_env.contains("PASSWORD_STORE_DIR")) {
path = _env.value("PASSWORD_STORE_DIR");
} else {
#ifdef Q_OS_WIN
path = QDir::homePath() + QDir::separator() + "password-store" + QDir::separator();
#else
path = QDir::homePath() + QDir::separator() + ".password-store" + QDir::separator();
#endif
}
return Util::normalizeFolderPath(path);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment