diff --git a/EncryptedMessaging.pro b/EncryptedMessaging.pro index 5590ab5..5e26267 100644 --- a/EncryptedMessaging.pro +++ b/EncryptedMessaging.pro @@ -1,12 +1,13 @@ ###################################################################### -# Automatically generated by qmake (3.1) Wed Mar 22 19:25:15 2017 +# Automatically generated by qmake (3.1) Thu Mar 23 12:02:37 2017 ###################################################################### TEMPLATE = app TARGET = EncryptedMessaging - QT += core gui QT += widgets +INCLUDEPATH += . # Input -SOURCES += main.cpp +HEADERS += messagingcontrols.h +SOURCES += main.cpp messagingcontrols.cpp diff --git a/Makefile b/Makefile index b13e4d4..5511ecb 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ CXX = g++ DEFINES = -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB CFLAGS = -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -Wall -W -D_REENTRANT -fPIC $(DEFINES) CXXFLAGS = -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I. -isystem /usr/include/qt -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtCore -I. -isystem /usr/include/libdrm -I/usr/lib/qt/mkspecs/linux-g++ +INCPATH = -I. -I. -isystem /usr/include/qt -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtCore -I. -isystem /usr/include/libdrm -I/usr/lib/qt/mkspecs/linux-g++ QMAKE = /usr/bin/qmake DEL_FILE = rm -f CHK_DIR_EXISTS= test -d @@ -48,8 +48,11 @@ OBJECTS_DIR = ./ ####### Files -SOURCES = main.cpp -OBJECTS = main.o +SOURCES = main.cpp \ + messagingcontrols.cpp moc_messagingcontrols.cpp +OBJECTS = main.o \ + messagingcontrols.o \ + moc_messagingcontrols.o DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/common/unix.conf \ /usr/lib/qt/mkspecs/common/linux.conf \ @@ -136,6 +139,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/features/qt_config.prf \ /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ /usr/lib/qt/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ /usr/lib/qt/mkspecs/features/toolchain.prf \ /usr/lib/qt/mkspecs/features/default_pre.prf \ @@ -154,7 +158,8 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/features/exceptions.prf \ /usr/lib/qt/mkspecs/features/yacc.prf \ /usr/lib/qt/mkspecs/features/lex.prf \ - EncryptedMessaging.pro main.cpp + EncryptedMessaging.pro messagingcontrols.h main.cpp \ + messagingcontrols.cpp QMAKE_TARGET = EncryptedMessaging DESTDIR = TARGET = EncryptedMessaging @@ -252,6 +257,7 @@ Makefile: EncryptedMessaging.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/l /usr/lib/qt/mkspecs/features/qt_config.prf \ /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ /usr/lib/qt/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ /usr/lib/qt/mkspecs/features/toolchain.prf \ /usr/lib/qt/mkspecs/features/default_pre.prf \ @@ -361,6 +367,7 @@ Makefile: EncryptedMessaging.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/l /usr/lib/qt/mkspecs/features/qt_config.prf: /usr/lib/qt/mkspecs/linux-g++/qmake.conf: /usr/lib/qt/mkspecs/features/spec_post.prf: +.qmake.stash: /usr/lib/qt/mkspecs/features/exclusive_builds.prf: /usr/lib/qt/mkspecs/features/toolchain.prf: /usr/lib/qt/mkspecs/features/default_pre.prf: @@ -398,7 +405,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 main.cpp $(DISTDIR)/ + $(COPY_FILE) --parents messagingcontrols.h $(DISTDIR)/ + $(COPY_FILE) --parents main.cpp messagingcontrols.cpp $(DISTDIR)/ clean: compiler_clean @@ -430,8 +438,14 @@ 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: +compiler_moc_header_make_all: moc_messagingcontrols.cpp compiler_moc_header_clean: + -$(DEL_FILE) moc_messagingcontrols.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 + compiler_moc_source_make_all: compiler_moc_source_clean: compiler_uic_make_all: @@ -442,13 +456,19 @@ compiler_yacc_impl_make_all: compiler_yacc_impl_clean: compiler_lex_make_all: compiler_lex_clean: -compiler_clean: compiler_moc_predefs_clean +compiler_clean: compiler_moc_predefs_clean compiler_moc_header_clean ####### Compile -main.o: main.cpp +main.o: main.cpp messagingcontrols.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp +messagingcontrols.o: messagingcontrols.cpp messagingcontrols.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o messagingcontrols.o messagingcontrols.cpp + +moc_messagingcontrols.o: moc_messagingcontrols.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_messagingcontrols.o moc_messagingcontrols.cpp + ####### Install install: FORCE diff --git a/main.cpp b/main.cpp index bf33591..7d2d3e8 100644 --- a/main.cpp +++ b/main.cpp @@ -1,8 +1,14 @@ #include +#include + +#include "messagingcontrols.h" int main(int argc, char* argv[]) { + QApplication app(argc, argv); + messagingcontrols* stuff = new messagingcontrols;; + stuff->show(); - return 0; + return app.exec(); } diff --git a/messagingcontrols.cpp b/messagingcontrols.cpp index 84c83bd..27a4753 100644 --- a/messagingcontrols.cpp +++ b/messagingcontrols.cpp @@ -1,10 +1,47 @@ +#include +#include +#include + #include "messagingcontrols.h" -messagingcontrols::messagingcontrols() +messagingcontrols::messagingcontrols(QWidget* parent) : QDialog(parent) { + QVBoxLayout* everything = new QVBoxLayout; + lblOfEncryptedBox = new QLabel(tr("Message: ")); + + encryptedBox = new QLineEdit; + + encryptionButon = new QPushButton; + + //Adding lbl and line edit + QHBoxLayout* lblAndLineEdit = new QHBoxLayout; + lblAndLineEdit->addWidget(lblOfEncryptedBox); + lblAndLineEdit->addWidget(encryptedBox); + + //Adding button + QHBoxLayout* button = new QHBoxLayout; + button->addWidget(encryptionButon); + + //Add everything + everything->addLayout(lblAndLineEdit); + everything->addLayout(button); + + setLayout(everything); + setWindowTitle("Encryption Messaging"); + setFixedHeight(300); + setFixedWidth(400); + /** + * Initialize controls + */ } messagingcontrols::~messagingcontrols() { + /** + * Delete pointer types + */ + delete lblOfEncryptedBox; + delete encryptionButon; + delete encryptedBox; } diff --git a/messagingcontrols.h b/messagingcontrols.h index 7817164..421296b 100644 --- a/messagingcontrols.h +++ b/messagingcontrols.h @@ -1,14 +1,33 @@ #ifndef MESSAGINGCONTROLS_H #define MESSAGINGCONTROLS_H -class messagingcontrols -{ -public: +#include +#include +#include +#include - messagingcontrols(); +class QLabel; +class QLineEdit; +class QPushButton; + +class messagingcontrols : public QDialog +{ + Q_OBJECT +public: + messagingcontrols(QWidget* parent = 0); ~messagingcontrols(); + /** +signals: + + +private slots: + +*/ private: + QLineEdit* encryptedBox; + QLabel* lblOfEncryptedBox; + QPushButton* encryptionButon; }; #endif