Skip to content
Permalink
Browse files
renamed Dialog to ConfigDialog for clarity, upped version number to 1…
….0.4
  • Loading branch information
annejan committed Nov 2, 2015
1 parent f6d68f4 commit 4302cc08a2bcbb058cf8d5c1db764d93d39704f5
Showing with 104 additions and 104 deletions.
  1. +84 −84 dialog.cpp → configdialog.cpp
  2. +5 −5 dialog.h → configdialog.h
  3. +4 −4 dialog.ui → configdialog.ui
  4. +1 −1 keygendialog.cpp
  5. +3 −3 keygendialog.h
  6. +2 −2 mainwindow.cpp
  7. +1 −1 qtpass.iss
  8. +4 −4 qtpass.pro

Large diffs are not rendered by default.

@@ -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();
@@ -1,7 +1,7 @@
<?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>
@@ -610,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">
@@ -626,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 slots:
void replace(QString, QString);
void done(int r);
void no_protection(bool enable);
Dialog *dialog;
ConfigDialog *dialog;

};

@@ -1,6 +1,6 @@
#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,7 +2,7 @@
; 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 MyAppExeName "qtpass.exe"
@@ -7,7 +7,7 @@
#
#-------------------------------------------------

VERSION = 1.0.3
VERSION = 1.0.4
TEMPLATE = app
QT += core gui

@@ -22,7 +22,7 @@ macx {

SOURCES += main.cpp\
mainwindow.cpp \
dialog.cpp \
configdialog.cpp \
storemodel.cpp \
util.cpp \
usersdialog.cpp \
@@ -32,7 +32,7 @@ SOURCES += main.cpp\
passworddialog.cpp

HEADERS += mainwindow.h \
dialog.h \
configdialog.h \
storemodel.h \
util.h \
usersdialog.h \
@@ -42,7 +42,7 @@ HEADERS += mainwindow.h \
passworddialog.h

FORMS += mainwindow.ui \
dialog.ui \
configdialog.ui \
usersdialog.ui \
keygendialog.ui \
passworddialog.ui

0 comments on commit 4302cc0

Please sign in to comment.