Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added New Features #47

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions Calculator/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Contributing to Hello_World_Calculator 🚀

Thank you for considering contributing to Hello_World_Calculator! Your involvement is essential to making this project better for everyone.

## How to Contribute 🤝

1. **Fork the Repository.**
2. **Clone the forked repository to your local machine:**

git clone https://github.com/yourusername/Hello_World_Calculator.git
cd Hello_World_Calculator


3. **Create a new branch for your feature or bug fix:**

git checkout -b feature-or-bugfix-name


4. **Make your changes, commit them, and push to your fork:**

git add .
git commit -m \"✨ Your descriptive commit message\"
git push origin feature-or-bugfix-name


5. **Create a Pull Request:**
- Go to your fork on GitHub.
- Click on \"Compare & pull request.\"
- Fill out the pull request template with details about your changes.

## Code Style and Guidelines 📝

Please adhere to the following guidelines when contributing:

- Follow the coding style used in the existing codebase.
- Ensure your code is well-documented and includes comments where necessary.
- Write clear commit messages that convey the purpose of your changes.

## Reporting Issues 🐞

If you encounter any issues or have suggestions, please open an issue on the [GitHub Issues](https://github.com/yourusername/Hello_World_Calculator/issues) page.

## Code of Conduct 🤖

Please review and adhere to our [Code of Conduct](CODE_OF_CONDUCT.md).

## License 📄

By contributing to Hello_World_Calculator, you agree that your contributions will be licensed under the [MIT License](LICENSE).

Thank you for contributing! 🎉\"" > CONTRIBUTING.md
16 changes: 13 additions & 3 deletions Calculator/Calculator.pro
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

CONFIG += c++17
QT += network

# The following define makes your compiler emit warnings if you use
# any Qt feature that has been marked deprecated (the exact warnings
Expand All @@ -15,20 +16,29 @@ DEFINES += QT_DEPRECATED_WARNINGS
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
binary_operation_handler.cpp \
currencyconvertermainwindow.cpp \
equals_handler.cpp \
main.cpp \
mainwindow.cpp \
unary_operation_handler.cpp
nameconvertormainwindow.cpp \
unary_operation_handler.cpp \
unitconvertormainwindow.cpp

HEADERS += \
binary_operation_handler.h \
binary_operation_handler.h \
currencyconvertermainwindow.h \
equals_handler.h \
mainwindow.h \
unary_operation_handler.h
nameconvertormainwindow.h \
unary_operation_handler.h \
unitconvertormainwindow.h

FORMS += \
mainwindow.ui
currencyconvertermainwindow.ui \
mainwindow.ui \
nameconvertormainwindow.ui \
unitconvertormainwindow.ui

# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
Expand Down
235 changes: 235 additions & 0 deletions Calculator/Calculator.pro.qtds

Large diffs are not rendered by default.

267 changes: 267 additions & 0 deletions Calculator/Calculator.pro.user

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions Calculator/Calculator_resources.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,16 @@
<file>Images/theme2.png</file>
<file>Images/theme4.png</file>
</qresource>
<qresource prefix="/">
<file>Images/Angle.png</file>
<file>Images/Area.png</file>
<file>Images/Fuel.png</file>
<file>Images/Length.png</file>
<file>Images/Pressure.png</file>
<file>Images/Speed.png</file>
<file>Images/Temperature.png</file>
<file>Images/Volume.png</file>
<file>Images/Weight.png</file>
<file>Images/Time.png</file>
</qresource>
</RCC>
Binary file added Calculator/Images/Angle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Area.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Currency.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Fuel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Length.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Picture1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Pressure.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Speed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Temperature.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Time.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Volume.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Calculator/Images/Weight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Calculator/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) [2023] [Hello_World_Calculator]

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 2 additions & 0 deletions Calculator/UnitConvert.qrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<!DOCTYPE RCC>
<RCC version="1.0"/>
1 change: 1 addition & 0 deletions Calculator/binary_operation_handler.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// do not try to play with comments
#include "binary_operation_handler.h"

Binary_Operation_Handler::Binary_Operation_Handler()
Expand Down
1 change: 1 addition & 0 deletions Calculator/binary_operation_handler.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// do not try to play with comments
#ifndef BINARY_OPERATION_HANDLER_H
#define BINARY_OPERATION_HANDLER_H
#include<string>
Expand Down
22 changes: 22 additions & 0 deletions Calculator/convertcm.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#include "convertcm.h"
#include "ui_convertcm.h"
#include<QPushButton>

convertcm::convertcm(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::convertcm)
{
ui->setupUi(this);

{
ui->setupUi(this);
connect(ui->back,&QPushButton::clicked,this,[=](){
emit this->back();
});
}
}

convertcm::~convertcm()
{
delete ui;
}
25 changes: 25 additions & 0 deletions Calculator/convertcm.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#ifndef CONVERTCM_H
#define CONVERTCM_H

#include <QMainWindow>

namespace Ui {
class convertcm;
}

class convertcm : public QMainWindow
{
Q_OBJECT

public:
explicit convertcm(QWidget *parent = nullptr);
~convertcm();

signals:
void back();

private:
Ui::convertcm *ui;
};

#endif // CONVERTCM_H
58 changes: 58 additions & 0 deletions Calculator/convertcm.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>convertcm</class>
<widget class="QMainWindow" name="convertcm">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>429</width>
<height>520</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>30</x>
<y>110</y>
<width>140</width>
<height>60</height>
</rect>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
<widget class="QPushButton" name="back">
<property name="geometry">
<rect>
<x>310</x>
<y>190</y>
<width>80</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>PushButton</string>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>429</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QStatusBar" name="statusbar"/>
</widget>
<resources/>
<connections/>
</ui>
45 changes: 45 additions & 0 deletions Calculator/convertor.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>459</width>
<height>520</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>50</x>
<y>90</y>
<width>140</width>
<height>80</height>
</rect>
</property>
<property name="text">
<string>Centimeter</string>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>459</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QStatusBar" name="statusbar"/>
</widget>
<resources/>
<connections/>
</ui>
25 changes: 25 additions & 0 deletions Calculator/convertorcm.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>600</height>
</rect>
</property>
<property name="windowTitle" >
<string>MainWindow</string>
</property>
<widget class="QMenuBar" name="menubar" />
<widget class="QWidget" name="centralwidget" />
<widget class="QStatusBar" name="statusbar" />
</widget>
<pixmapfunction></pixmapfunction>
<connections/>
</ui>

Loading