diff --git a/Notepad.pro b/Notepad.pro index 3beeb5e..bd70597 100644 --- a/Notepad.pro +++ b/Notepad.pro @@ -1,18 +1,17 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2018-10-26T18:07:40 -# -#------------------------------------------------- +###################################################################### +# Automatically generated by qmake (3.1) Mon Oct 21 19:48:12 2019 +###################################################################### QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = Notepad TEMPLATE = app +TARGET = Notepad +INCLUDEPATH += . -# The following define makes your compiler emit warnings if you use -# any feature of Qt which has been marked as deprecated (the exact warnings +# The following define makes your compiler warn you if you use any +# feature of Qt which has been marked as deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the # deprecated API in order to know how to port your code away from it. DEFINES += QT_DEPRECATED_WARNINGS @@ -22,22 +21,9 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -SOURCES += \ - main.cpp \ - notepad.cpp \ - finddialog.cpp - -HEADERS += \ - notepad.h \ - finddialog.h - -FORMS += \ - notepad.ui \ - finddialog.ui - -RESOURCES += \ - resource.qrc - -DISTFILES += \ - save.png +# Input +HEADERS += finddialog.h notepad.h +FORMS += finddialog.ui notepad.ui +SOURCES += finddialog.cpp main.cpp notepad.cpp +RESOURCES += resource.qrc +DISTFILES += save.png \ No newline at end of file diff --git a/Notepad.pro.user b/Notepad.pro.user index c44f7d3..04e59a3 100644 --- a/Notepad.pro.user +++ b/Notepad.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {ad5906ba-36a3-495c-b75f-860c74fcd8ad} + {18a73125-a384-46a7-ac8f-bc8eb8a44bb2} ProjectExplorer.Project.ActiveTarget @@ -59,74 +59,14 @@ ProjectExplorer.Project.Target.0 - kit1 - kit1 - {212f8a4f-d201-41ca-bf93-1b6867f28049} + Desktop + Desktop + {70b1e1ee-ecd4-4680-b182-89edcc9487eb} 0 0 0 - /home/akhilam512/qtt/build-Notepad-kit1-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/akhilam512/qtt/build-Notepad-kit1-Release + /home/sash/hactoberfest/git/Notepad true @@ -185,67 +125,7 @@ 0 true - - /home/akhilam512/qtt/build-Notepad-kit1-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 + 1 0 @@ -304,13 +184,13 @@ Notepad - Qt4ProjectManager.Qt4RunConfiguration:/home/akhilam512/qtt/Notepad/Notepad.pro + Qt4ProjectManager.Qt4RunConfiguration:/home/sash/hactoberfest/git/Notepad/Notepad.pro true Notepad.pro false - /home/akhilam512/qtt/build-Notepad-kit1-Debug + /home/sash/hactoberfest/git/Notepad 3768 false true @@ -334,3 +214,4 @@ 18 + diff --git a/finddialog.cpp b/finddialog.cpp index 7e2e7ba..ac5f0aa 100644 --- a/finddialog.cpp +++ b/finddialog.cpp @@ -15,7 +15,7 @@ FindDialog::~FindDialog() delete ui2; } -void FindDialog::on_buttonBox_clicked(QAbstractButton *button) +/*void FindDialog::on_buttonBox_clicked(QAbstractButton *button) { //QString q = Notepad::ui->plainTextEdit->toPlainText(); //ui2->lineEdit = ui->plainTextEdit->toPlainText(); @@ -40,5 +40,6 @@ void FindDialog::on_buttonBox_clicked(QAbstractButton *button) } - */ + } +*/ diff --git a/finddialog.h b/finddialog.h index 8a1e3c8..12917bc 100644 --- a/finddialog.h +++ b/finddialog.h @@ -2,6 +2,7 @@ #define FINDDIALOG_H #include "notepad.h" #include +#include #include @@ -18,7 +19,7 @@ class FindDialog : public QDialog ~FindDialog(); private slots: - void on_buttonBox_clicked(QAbstractButton *button); + // void on_buttonBox_clicked(QAbstractButton *button); private: diff --git a/icons/copy.png b/icons/copy.png index 5d43e1e..aef35ca 100644 Binary files a/icons/copy.png and b/icons/copy.png differ diff --git a/icons/cut.png b/icons/cut.png index 581afb0..d77c2f1 100644 Binary files a/icons/cut.png and b/icons/cut.png differ diff --git a/icons/edit.png b/icons/edit.png index 15161ef..a125c44 100644 Binary files a/icons/edit.png and b/icons/edit.png differ diff --git a/icons/file.png b/icons/file.png index a8cf2d1..0de5d18 100644 Binary files a/icons/file.png and b/icons/file.png differ diff --git a/icons/info.png b/icons/info.png index 2526170..7714832 100644 Binary files a/icons/info.png and b/icons/info.png differ diff --git a/icons/paste.png b/icons/paste.png index c15dda3..49f15ba 100644 Binary files a/icons/paste.png and b/icons/paste.png differ diff --git a/icons/save.png b/icons/save.png index a5fc97a..0ca4ba1 100644 Binary files a/icons/save.png and b/icons/save.png differ diff --git a/icons/undo.png b/icons/undo.png index 6066b30..a65d641 100644 Binary files a/icons/undo.png and b/icons/undo.png differ diff --git a/notepad.cpp b/notepad.cpp index 0cc2d45..6815068 100644 --- a/notepad.cpp +++ b/notepad.cpp @@ -128,6 +128,7 @@ void Notepad::on_actionAbout_Me_triggered() { QString a = "Creator : akhilam512\n"; a += "Date : 26 - 10 - 2018\n"; + a += "Contributor : sash2501\n"; a += " -- Notepad -- "; QMessageBox::about(this, "About Noteza", a); diff --git a/notepad.h b/notepad.h index 30c4f78..0197a84 100644 --- a/notepad.h +++ b/notepad.h @@ -3,6 +3,7 @@ #include #include +#include namespace Ui { class Notepad; } @@ -45,9 +46,9 @@ private slots: void on_actionChange_Font_triggered(); - void on_actionText_Colour_triggered(); + //void on_actionText_Colour_triggered(); - void on_actionBackground_Colour_triggered(); + //void on_actionBackground_Colour_triggered(); void on_actionTheme_triggered(); diff --git a/notepad_ss/File.png b/notepad_ss/File.png index 57c8398..8a30144 100644 Binary files a/notepad_ss/File.png and b/notepad_ss/File.png differ diff --git a/notepad_ss/aboutme.png b/notepad_ss/aboutme.png index 2c1b78d..5019e66 100644 Binary files a/notepad_ss/aboutme.png and b/notepad_ss/aboutme.png differ diff --git a/notepad_ss/changedfont.png b/notepad_ss/changedfont.png index f271a2c..ba954f9 100644 Binary files a/notepad_ss/changedfont.png and b/notepad_ss/changedfont.png differ diff --git a/notepad_ss/copy.png b/notepad_ss/copy.png index 4e815cb..17b166f 100644 Binary files a/notepad_ss/copy.png and b/notepad_ss/copy.png differ diff --git a/notepad_ss/cut.png b/notepad_ss/cut.png index 6ba5a55..27f01b0 100644 Binary files a/notepad_ss/cut.png and b/notepad_ss/cut.png differ diff --git a/notepad_ss/edit.png b/notepad_ss/edit.png index 772792c..6ceab10 100644 Binary files a/notepad_ss/edit.png and b/notepad_ss/edit.png differ diff --git a/notepad_ss/font.png b/notepad_ss/font.png index 00ccf3b..c8b3a60 100644 Binary files a/notepad_ss/font.png and b/notepad_ss/font.png differ diff --git a/notepad_ss/mainwindow.png b/notepad_ss/mainwindow.png index f6aed86..2f49a99 100644 Binary files a/notepad_ss/mainwindow.png and b/notepad_ss/mainwindow.png differ diff --git a/notepad_ss/options.png b/notepad_ss/options.png index 44c4963..4f26c1b 100644 Binary files a/notepad_ss/options.png and b/notepad_ss/options.png differ diff --git a/notepad_ss/redo.png b/notepad_ss/redo.png index 4f815fd..9363f2d 100644 Binary files a/notepad_ss/redo.png and b/notepad_ss/redo.png differ diff --git a/notepad_ss/sampletxt.png b/notepad_ss/sampletxt.png index 0256afc..06c46ce 100644 Binary files a/notepad_ss/sampletxt.png and b/notepad_ss/sampletxt.png differ diff --git a/notepad_ss/save.png b/notepad_ss/save.png index 79a25cb..fba5423 100644 Binary files a/notepad_ss/save.png and b/notepad_ss/save.png differ diff --git a/notepad_ss/undo.png b/notepad_ss/undo.png index aaec7a0..0ec9b9f 100644 Binary files a/notepad_ss/undo.png and b/notepad_ss/undo.png differ