aboutsummaryrefslogtreecommitdiff
path: root/src-qt5
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2016-10-13 16:54:17 -0400
committerKen Moore <ken@pcbsd.org>2016-10-13 16:54:17 -0400
commit12417274b55f86acaa88cceb89b731b3a1398b36 (patch)
tree19a9a64e6abd55cc5dd5fab9d5ac2d2240d4ea0d /src-qt5
parentMerge pull request #286 from q5sys/master (diff)
downloadlumina-12417274b55f86acaa88cceb89b731b3a1398b36.tar.gz
lumina-12417274b55f86acaa88cceb89b731b3a1398b36.tar.bz2
lumina-12417274b55f86acaa88cceb89b731b3a1398b36.zip
Add a title/icon for the lumina-calculator window.
Diffstat (limited to 'src-qt5')
-rw-r--r--src-qt5/desktop-utils/lumina-calculator/mainUI.cpp38
1 files changed, 20 insertions, 18 deletions
diff --git a/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp b/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp
index f759f5c6..244a7f3e 100644
--- a/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp
@@ -8,6 +8,7 @@
#include "ui_mainUI.h"
#include <QDebug>
+#include <LuminaXDG.h>
#define VALIDSYMBOLS QString("+-*x/.")
@@ -18,24 +19,25 @@ mainUI::mainUI() : QMainWindow(), ui(new Ui::mainUI()){
ui->setupUi(this);
connect(ui->tool_clear, SIGNAL(clicked()), this, SLOT(clear_calc()) );
connect(ui->line_eq, SIGNAL(returnPressed()), this, SLOT(start_calc()) );
- connect (ui->button_1, SIGNAL (clicked()), this, SLOT (captureButton1()));
- connect (ui->button_2, SIGNAL (clicked()), this, SLOT (captureButton2()));
- connect (ui->button_3, SIGNAL (clicked()), this, SLOT (captureButton3()));
- connect (ui->button_4, SIGNAL (clicked()), this, SLOT (captureButton4()));
- connect (ui->button_5, SIGNAL (clicked()), this, SLOT (captureButton5()));
- connect (ui->button_6, SIGNAL (clicked()), this, SLOT (captureButton6()));
- connect (ui->button_7, SIGNAL (clicked()), this, SLOT (captureButton7()));
- connect (ui->button_8, SIGNAL (clicked()), this, SLOT (captureButton8()));
- connect (ui->button_9, SIGNAL (clicked()), this, SLOT (captureButton9()));
- connect (ui->button_0, SIGNAL (clicked()), this, SLOT (captureButton0()));
- connect (ui->button_Subtract, SIGNAL (clicked()), this, SLOT (captureButtonSubtract()));
- connect (ui->button_Add, SIGNAL (clicked()), this, SLOT (captureButtonAdd()));
- connect (ui->button_Divide, SIGNAL (clicked()), this, SLOT (captureButtonDivide()));
- connect (ui->button_Multiply, SIGNAL (clicked()), this, SLOT (captureButtonMultiply()));
- connect (ui->button_Decimal, SIGNAL (clicked()), this, SLOT (captureButtonDecimal()));
- connect (ui->button_Equal, SIGNAL (clicked()), this, SLOT (start_calc()));
-
+ connect(ui->button_1, SIGNAL (clicked()), this, SLOT (captureButton1()));
+ connect(ui->button_2, SIGNAL (clicked()), this, SLOT (captureButton2()));
+ connect(ui->button_3, SIGNAL (clicked()), this, SLOT (captureButton3()));
+ connect(ui->button_4, SIGNAL (clicked()), this, SLOT (captureButton4()));
+ connect(ui->button_5, SIGNAL (clicked()), this, SLOT (captureButton5()));
+ connect(ui->button_6, SIGNAL (clicked()), this, SLOT (captureButton6()));
+ connect(ui->button_7, SIGNAL (clicked()), this, SLOT (captureButton7()));
+ connect(ui->button_8, SIGNAL (clicked()), this, SLOT (captureButton8()));
+ connect(ui->button_9, SIGNAL (clicked()), this, SLOT (captureButton9()));
+ connect(ui->button_0, SIGNAL (clicked()), this, SLOT (captureButton0()));
+ connect(ui->button_Subtract, SIGNAL (clicked()), this, SLOT (captureButtonSubtract()));
+ connect(ui->button_Add, SIGNAL (clicked()), this, SLOT (captureButtonAdd()));
+ connect(ui->button_Divide, SIGNAL (clicked()), this, SLOT (captureButtonDivide()));
+ connect(ui->button_Multiply, SIGNAL (clicked()), this, SLOT (captureButtonMultiply()));
+ connect(ui->button_Decimal, SIGNAL (clicked()), this, SLOT (captureButtonDecimal()));
+ connect(ui->button_Equal, SIGNAL (clicked()), this, SLOT (start_calc()));
+ this->setWindowTitle(tr("Calculator"));
+ this->setWindowIcon( LXDG::findIcon("accessories-calculator","") );
ui->line_eq->setFocus();
}
@@ -86,7 +88,7 @@ double mainUI::performOperation(double LHS, double RHS, QChar symbol){
double mainUI::strToNumber(QString str){
//Look for perentheses first
- qDebug() << "String to Number: " << str;
+ //qDebug() << "String to Number: " << str;
if(str.indexOf("(")>=0){
//qDebug() << "Found Parenthesis";
int start = str.indexOf("(");
bgstack15