From dd14c9c23b06bbd3e5c83fdf660844aab089c747 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Sun, 10 Jan 2010 19:50:53 +0100 Subject: [PATCH] adding ui --- mnencd.cpp | 32 +++++--- unlock/Makefile | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++++ unlock/main.cpp | 31 ++++++++ unlock/ui_unlock.h | 73 ++++++++++++++++++ unlock/unlock.cpp | 42 ++++++++++ unlock/unlock.hpp | 39 ++++++++++ unlock/unlock.pro | 13 ++++ unlock/unlock.ui | 94 +++++++++++++++++++++++ 8 files changed, 528 insertions(+), 12 deletions(-) create mode 100644 unlock/Makefile create mode 100644 unlock/main.cpp create mode 100644 unlock/ui_unlock.h create mode 100644 unlock/unlock.cpp create mode 100644 unlock/unlock.hpp create mode 100644 unlock/unlock.pro create mode 100644 unlock/unlock.ui diff --git a/mnencd.cpp b/mnencd.cpp index 2573b47..ddc89e2 100644 --- a/mnencd.cpp +++ b/mnencd.cpp @@ -61,13 +61,6 @@ int main(int argc, char** argv) { umask(0); /* Open any logs here */ - - /* Create a new SID for the child process */ - sid = setsid(); - if (sid < 0) { - /* Log the failure */ - exit(EXIT_FAILURE); - } std::string name, dirname; name = getenv("USER"); dirname = "/home/" + name + "/.mnenc/"; @@ -76,10 +69,26 @@ int main(int argc, char** argv) { exit(EXIT_FAILURE); } } - + /*This is log stuff */ + std::string logname = "/home/" + name + "/.mnenc/log"; + std::ofstream log; //Log stream + log.open(logname.c_str(), ios::app); // open log + time_t rawtime; //Time stuff here + struct tm * timeinfo; + time ( &rawtime ); + timeinfo = localtime ( &rawtime ); + std::string current_time = asctime (timeinfo); //Holds current time + + /* Create a new SID for the child process */ + sid = setsid(); + if (sid < 0) { + log << current_time << ": Unable to create a new SID for the child process\n"; + exit(EXIT_FAILURE); + } + /* Change the current working directory */ if ((chdir("/tmp/")) < 0) { - /* Log the failure */ + log << current_time << ": Could not change to /tmp\n"; exit(EXIT_FAILURE); } @@ -89,10 +98,9 @@ int main(int argc, char** argv) { close(STDERR_FILENO); /* Daemon-specific initialization goes here */ - - mkfifo("./mnencdfifo", 0777); + mkfifo("./mnencdfifo", 0777); //This is the fifo for communications signal(SIGTERM, term); // register a SIGTERM handler - //raise(SIGTERM); // will cause term() to run + log.close(); //Closing log /* The Big Loop */ while (1) { diff --git a/unlock/Makefile b/unlock/Makefile new file mode 100644 index 0000000..4869147 --- /dev/null +++ b/unlock/Makefile @@ -0,0 +1,216 @@ +############################################################################# +# Makefile for building: unlock +# Generated by qmake (2.01a) (Qt 4.6.0) on: sön jan 10 19:41:04 2010 +# Project: unlock.pro +# Template: app +# Command: /usr/bin/qmake -unix -o Makefile unlock.pro +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include -I. -I. -I. +LINK = g++ +LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/lib +LIBS = $(SUBLIBS) -L/usr/lib -lQtGui -lQtCore -lpthread +AR = ar cqs +RANLIB = +QMAKE = /usr/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -sf +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = main.cpp \ + unlock.cpp moc_unlock.cpp +OBJECTS = main.o \ + unlock.o \ + moc_unlock.o +DIST = /usr/mkspecs/common/g++.conf \ + /usr/mkspecs/common/unix.conf \ + /usr/mkspecs/common/linux.conf \ + /usr/mkspecs/qconfig.pri \ + /usr/mkspecs/features/qt_functions.prf \ + /usr/mkspecs/features/qt_config.prf \ + /usr/mkspecs/features/exclusive_builds.prf \ + /usr/mkspecs/features/default_pre.prf \ + /usr/mkspecs/features/release.prf \ + /usr/mkspecs/features/default_post.prf \ + /usr/mkspecs/features/warn_on.prf \ + /usr/mkspecs/features/qt.prf \ + /usr/mkspecs/features/unix/thread.prf \ + /usr/mkspecs/features/moc.prf \ + /usr/mkspecs/features/resources.prf \ + /usr/mkspecs/features/uic.prf \ + /usr/mkspecs/features/yacc.prf \ + /usr/mkspecs/features/lex.prf \ + /usr/mkspecs/features/include_source_dir.prf \ + unlock.pro +QMAKE_TARGET = unlock +DESTDIR = +TARGET = unlock + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile $(TARGET) + +$(TARGET): ui_unlock.h $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: unlock.pro /usr/mkspecs/linux-g++/qmake.conf /usr/mkspecs/common/g++.conf \ + /usr/mkspecs/common/unix.conf \ + /usr/mkspecs/common/linux.conf \ + /usr/mkspecs/qconfig.pri \ + /usr/mkspecs/features/qt_functions.prf \ + /usr/mkspecs/features/qt_config.prf \ + /usr/mkspecs/features/exclusive_builds.prf \ + /usr/mkspecs/features/default_pre.prf \ + /usr/mkspecs/features/release.prf \ + /usr/mkspecs/features/default_post.prf \ + /usr/mkspecs/features/warn_on.prf \ + /usr/mkspecs/features/qt.prf \ + /usr/mkspecs/features/unix/thread.prf \ + /usr/mkspecs/features/moc.prf \ + /usr/mkspecs/features/resources.prf \ + /usr/mkspecs/features/uic.prf \ + /usr/mkspecs/features/yacc.prf \ + /usr/mkspecs/features/lex.prf \ + /usr/mkspecs/features/include_source_dir.prf \ + /usr/lib/libQtGui.prl \ + /usr/lib/libQtCore.prl + $(QMAKE) -unix -o Makefile unlock.pro +/usr/mkspecs/common/g++.conf: +/usr/mkspecs/common/unix.conf: +/usr/mkspecs/common/linux.conf: +/usr/mkspecs/qconfig.pri: +/usr/mkspecs/features/qt_functions.prf: +/usr/mkspecs/features/qt_config.prf: +/usr/mkspecs/features/exclusive_builds.prf: +/usr/mkspecs/features/default_pre.prf: +/usr/mkspecs/features/release.prf: +/usr/mkspecs/features/default_post.prf: +/usr/mkspecs/features/warn_on.prf: +/usr/mkspecs/features/qt.prf: +/usr/mkspecs/features/unix/thread.prf: +/usr/mkspecs/features/moc.prf: +/usr/mkspecs/features/resources.prf: +/usr/mkspecs/features/uic.prf: +/usr/mkspecs/features/yacc.prf: +/usr/mkspecs/features/lex.prf: +/usr/mkspecs/features/include_source_dir.prf: +/usr/lib/libQtGui.prl: +/usr/lib/libQtCore.prl: +qmake: FORCE + @$(QMAKE) -unix -o Makefile unlock.pro + +dist: + @$(CHK_DIR_EXISTS) .tmp/unlock1.0.0 || $(MKDIR) .tmp/unlock1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/unlock1.0.0/ && $(COPY_FILE) --parents unlock.hpp .tmp/unlock1.0.0/ && $(COPY_FILE) --parents main.cpp unlock.cpp .tmp/unlock1.0.0/ && $(COPY_FILE) --parents unlock.ui .tmp/unlock1.0.0/ && (cd `dirname .tmp/unlock1.0.0` && $(TAR) unlock1.0.0.tar unlock1.0.0 && $(COMPRESS) unlock1.0.0.tar) && $(MOVE) `dirname .tmp/unlock1.0.0`/unlock1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/unlock1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile + + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +compiler_moc_header_make_all: moc_unlock.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_unlock.cpp +moc_unlock.cpp: ui_unlock.h \ + unlock.hpp + /usr/bin/moc $(DEFINES) $(INCPATH) unlock.hpp -o moc_unlock.cpp + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_unlock.h +compiler_uic_clean: + -$(DEL_FILE) ui_unlock.h +ui_unlock.h: unlock.ui + /usr/bin/uic unlock.ui -o ui_unlock.h + +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_header_clean compiler_uic_clean + +####### Compile + +main.o: main.cpp unlock.hpp \ + ui_unlock.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp + +unlock.o: unlock.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o unlock.o unlock.cpp + +moc_unlock.o: moc_unlock.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_unlock.o moc_unlock.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/unlock/main.cpp b/unlock/main.cpp new file mode 100644 index 0000000..5e2f3c7 --- /dev/null +++ b/unlock/main.cpp @@ -0,0 +1,31 @@ +// main.cpp +// +// Copyright 2010 Micke Nordin +// +// 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. + + +#include + #include "unlock.hpp" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + Unlock *dialog = new Unlock; + + dialog->show(); + return app.exec(); +} diff --git a/unlock/ui_unlock.h b/unlock/ui_unlock.h new file mode 100644 index 0000000..a2785f4 --- /dev/null +++ b/unlock/ui_unlock.h @@ -0,0 +1,73 @@ +/******************************************************************************** +** Form generated from reading UI file 'unlock.ui' +** +** Created: Sun Jan 10 19:35:33 2010 +** by: Qt User Interface Compiler version 4.6.0 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_UNLOCK_H +#define UI_UNLOCK_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_Dialog +{ +public: + QDialogButtonBox *buttonBox; + QLineEdit *lineEdit; + QLabel *label; + + void setupUi(QDialog *Dialog) + { + if (Dialog->objectName().isEmpty()) + Dialog->setObjectName(QString::fromUtf8("Dialog")); + Dialog->resize(255, 77); + buttonBox = new QDialogButtonBox(Dialog); + buttonBox->setObjectName(QString::fromUtf8("buttonBox")); + buttonBox->setGeometry(QRect(150, 10, 81, 301)); + buttonBox->setOrientation(Qt::Vertical); + buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); + lineEdit = new QLineEdit(Dialog); + lineEdit->setObjectName(QString::fromUtf8("lineEdit")); + lineEdit->setGeometry(QRect(30, 40, 113, 26)); + label = new QLabel(Dialog); + label->setObjectName(QString::fromUtf8("label")); + label->setGeometry(QRect(30, 10, 111, 20)); + + retranslateUi(Dialog); + QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject())); + QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept())); + + QMetaObject::connectSlotsByName(Dialog); + } // setupUi + + void retranslateUi(QDialog *Dialog) + { + Dialog->setWindowTitle(QApplication::translate("Dialog", "Dialog", 0, QApplication::UnicodeUTF8)); +#ifndef QT_NO_WHATSTHIS + lineEdit->setWhatsThis(QString()); +#endif // QT_NO_WHATSTHIS + label->setText(QApplication::translate("Dialog", "Enter password", 0, QApplication::UnicodeUTF8)); + } // retranslateUi + +}; + +namespace Ui { + class Dialog: public Ui_Dialog {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_UNLOCK_H diff --git a/unlock/unlock.cpp b/unlock/unlock.cpp new file mode 100644 index 0000000..56755f4 --- /dev/null +++ b/unlock/unlock.cpp @@ -0,0 +1,42 @@ +// unlock.cpp +// +// Copyright 2010 Micke Nordin +// +// 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 3 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. + + +#include +#include "unlock.h" + +// if we include there is no need to include every class used: , ,... + +Unlock::Unlock(QWidget *parent) { + setupUi(this); // this sets up GUI + + // signals/slots mechanism in action + connect( pushButton_browse, SIGNAL( clicked() ), this, SLOT( accepted() ) ); + connect( pushButton_do, SIGNAL( clicked() ), this, SLOT( rejected() ) ); +} + + +void Unlock::accepted() { +// +} + + +void Unlock::rejected() { + // +} diff --git a/unlock/unlock.hpp b/unlock/unlock.hpp new file mode 100644 index 0000000..5f72a96 --- /dev/null +++ b/unlock/unlock.hpp @@ -0,0 +1,39 @@ +// unlock.hpp +// +// Copyright 2010 Micke Nordin +// +// 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. + + +#ifndef _unlock_h_included_ +#define _unlock_h_included_ + +#include "ui_unlock.h" + +class Unlock : public QWidget, private Ui::QDialog { + Q_OBJECT + +public: + Unlock(QWidget *parent = 0); + + +public slots: + void accepted(); + void rejected(); +}; + + +#endif diff --git a/unlock/unlock.pro b/unlock/unlock.pro new file mode 100644 index 0000000..4f292f2 --- /dev/null +++ b/unlock/unlock.pro @@ -0,0 +1,13 @@ +###################################################################### +# Automatically generated by qmake (2.01a) sön jan 10 19:35:11 2010 +###################################################################### + +TEMPLATE = app +TARGET = +DEPENDPATH += . +INCLUDEPATH += . + +# Input +HEADERS += unlock.hpp +FORMS += unlock.ui +SOURCES += main.cpp unlock.cpp diff --git a/unlock/unlock.ui b/unlock/unlock.ui new file mode 100644 index 0000000..f32f857 --- /dev/null +++ b/unlock/unlock.ui @@ -0,0 +1,94 @@ + + + Dialog + + + + 0 + 0 + 255 + 77 + + + + Dialog + + + + + 150 + 10 + 81 + 301 + + + + Qt::Vertical + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + 30 + 40 + 113 + 26 + + + + + + + + + + 30 + 10 + 111 + 20 + + + + Enter password + + + + + + + buttonBox + rejected() + Dialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + buttonBox + accepted() + Dialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + -- 1.7.9.5