Issue #1 #2 #4 are addressed in this commit. Added another window with controls for key management. Simple ASCII encryption

This commit is contained in:
amazing-username
2017-03-27 21:27:28 -05:00
parent 9894385576
commit 3f5d67e4cf
10 changed files with 194 additions and 16 deletions
+24 -7
View File
@@ -51,16 +51,20 @@ OBJECTS_DIR = ./
SOURCES = Decryption.cpp \
Encryption.cpp \
Cryption.cpp \
KeyManagementWindow.cpp \
GenerateKeys.cpp \
Main.cpp \
MessagingControls.cpp moc_MessagingControls.cpp
MessagingControls.cpp moc_MessagingControls.cpp \
moc_KeyManagementWindow.cpp
OBJECTS = Decryption.o \
Encryption.o \
Cryption.o \
KeyManagementWindow.o \
GenerateKeys.o \
Main.o \
MessagingControls.o \
moc_MessagingControls.o
moc_MessagingControls.o \
moc_KeyManagementWindow.o
DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/common/unix.conf \
/usr/lib/qt/mkspecs/common/linux.conf \
@@ -170,9 +174,11 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
Encryption.h \
GenerateKeys.h \
MessagingControls.h \
Cryption.h Decryption.cpp \
Cryption.h \
KeyManagementWindow.h Decryption.cpp \
Encryption.cpp \
Cryption.cpp \
KeyManagementWindow.cpp \
GenerateKeys.cpp \
Main.cpp \
MessagingControls.cpp
@@ -421,8 +427,8 @@ distdir: FORCE
@test -d $(DISTDIR) || mkdir -p $(DISTDIR)
$(COPY_FILE) --parents $(DIST) $(DISTDIR)/
$(COPY_FILE) --parents /usr/lib/qt/mkspecs/features/data/dummy.cpp $(DISTDIR)/
$(COPY_FILE) --parents Decryption.h Encryption.h GenerateKeys.h MessagingControls.h Cryption.h $(DISTDIR)/
$(COPY_FILE) --parents Decryption.cpp Encryption.cpp Cryption.cpp GenerateKeys.cpp Main.cpp MessagingControls.cpp $(DISTDIR)/
$(COPY_FILE) --parents Decryption.h Encryption.h GenerateKeys.h MessagingControls.h Cryption.h KeyManagementWindow.h $(DISTDIR)/
$(COPY_FILE) --parents Decryption.cpp Encryption.cpp Cryption.cpp KeyManagementWindow.cpp GenerateKeys.cpp Main.cpp MessagingControls.cpp $(DISTDIR)/
clean: compiler_clean
@@ -454,14 +460,19 @@ compiler_moc_predefs_clean:
moc_predefs.h: /usr/lib/qt/mkspecs/features/data/dummy.cpp
g++ -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -Wall -W -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp
compiler_moc_header_make_all: moc_MessagingControls.cpp
compiler_moc_header_make_all: moc_MessagingControls.cpp moc_KeyManagementWindow.cpp
compiler_moc_header_clean:
-$(DEL_FILE) moc_MessagingControls.cpp
-$(DEL_FILE) moc_MessagingControls.cpp moc_KeyManagementWindow.cpp
moc_MessagingControls.cpp: MessagingControls.h \
moc_predefs.h \
/usr/bin/moc
/usr/bin/moc $(DEFINES) --include ./moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/monde/Programming/Qt/EncryptedMessaging -I/home/monde/Programming/Qt/EncryptedMessaging -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtCore -I/usr/include/c++/6.3.1 -I/usr/include/c++/6.3.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.3.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include-fixed -I/usr/include MessagingControls.h -o moc_MessagingControls.cpp
moc_KeyManagementWindow.cpp: KeyManagementWindow.h \
moc_predefs.h \
/usr/bin/moc
/usr/bin/moc $(DEFINES) --include ./moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/monde/Programming/Qt/EncryptedMessaging -I/home/monde/Programming/Qt/EncryptedMessaging -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtCore -I/usr/include/c++/6.3.1 -I/usr/include/c++/6.3.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.3.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include-fixed -I/usr/include KeyManagementWindow.h -o moc_KeyManagementWindow.cpp
compiler_moc_source_make_all:
compiler_moc_source_clean:
compiler_uic_make_all:
@@ -489,6 +500,9 @@ Encryption.o: Encryption.cpp Encryption.h \
Cryption.o: Cryption.cpp Cryption.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Cryption.o Cryption.cpp
KeyManagementWindow.o: KeyManagementWindow.cpp KeyManagementWindow.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o KeyManagementWindow.o KeyManagementWindow.cpp
GenerateKeys.o: GenerateKeys.cpp GenerateKeys.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o GenerateKeys.o GenerateKeys.cpp
@@ -501,6 +515,9 @@ MessagingControls.o: MessagingControls.cpp MessagingControls.h
moc_MessagingControls.o: moc_MessagingControls.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_MessagingControls.o moc_MessagingControls.cpp
moc_KeyManagementWindow.o: moc_KeyManagementWindow.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_KeyManagementWindow.o moc_KeyManagementWindow.cpp
####### Install
install: FORCE