crtxcr
/
qsrun
1
0
Tükrözés 0
Kód Hibajegyek 29 Egyesítési kérések 1 Kiadások Tevékenység

formating fixes / copyright update...

This commit is contained in:
Albert S. 2019-09-30 21:58:11 +02:00
szülő fe5b358ace
commit d6ec7a7e1c
10 fájl változott, egészen pontosan 27 új sor hozzáadva és 49 régi sor törölve
Statisztikák mutatása Download Patch File Download Diff File Expand all files Collapse all files

2
calculationengine.cpp
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

2
calculationengine.h
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

6
config.cpp
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -87,12 +87,8 @@ EntryConfig ConfigReader::readFromDesktopFile(const QString &path)
} }
} }
} }
} }
} }
return result; return result;
} }

2
config.h
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

2
entrypushbutton.cpp
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

2
entrypushbutton.h
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

2
main.cpp
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

20
window.cpp
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -43,8 +43,6 @@ Window::Window(ConfigProvider &configProvider)
calculationResultLabel.setAlignment(Qt::AlignCenter); calculationResultLabel.setAlignment(Qt::AlignCenter);
calculationResultLabel.setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu); calculationResultLabel.setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
connect(&calculationResultLabel, &QLabel::customContextMenuRequested, this, &Window::showCalculationResultContextMenu); connect(&calculationResultLabel, &QLabel::customContextMenuRequested, this, &Window::showCalculationResultContextMenu);
} }
Window::~Window() Window::~Window()
@ -53,9 +51,6 @@ Window::~Window()
} }
void Window::initFromConfig() void Window::initFromConfig()
{ {
try try
@ -233,11 +228,9 @@ void Window::lineEditTextChanged(QString text)
QString input = text.mid(1); QString input = text.mid(1);
if(text[0] == '=') if(text[0] == '=')
{ {
addCalcResult(input); addCalcResult(input);
return; return;
} }
} }
filterGridFor(text); filterGridFor(text);
@ -246,7 +239,6 @@ void Window::lineEditTextChanged(QString text)
addPATHSuggestion(text); addPATHSuggestion(text);
if(this->grid->count() == 0) if(this->grid->count() == 0)
{ {
QStringList arguments = text.split(" "); QStringList arguments = text.split(" ");
EntryConfig e; EntryConfig e;
e.name = "Execute: " + text; e.name = "Execute: " + text;
@ -273,7 +265,6 @@ void Window::keyReleaseEvent(QKeyEvent *event)
{ {
button->showName(); button->showName();
} }
} }
QWidget::keyReleaseEvent(event); QWidget::keyReleaseEvent(event);
@ -288,20 +279,17 @@ void Window::keyPressEvent(QKeyEvent *event)
if(event->modifiers() & Qt::ControlModifier && buttonsInGrid.count() > 0) if(event->modifiers() & Qt::ControlModifier && buttonsInGrid.count() > 0)
{ {
if(event->key() == Qt::Key_L) if(event->key() == Qt::Key_L)
{ {
this->lineEdit->setFocus(); this->lineEdit->setFocus();
this->lineEdit->selectAll(); this->lineEdit->selectAll();
} }
for(EntryPushButton *button : buttonsInGrid) for(EntryPushButton *button : buttonsInGrid)
{ {
button->showShortcut(); button->showShortcut();
} }
QKeySequence seq(event->key()); QKeySequence seq(event->key());
QString key = seq.toString().toLower(); QString key = seq.toString().toLower();
@ -394,12 +382,8 @@ void Window::setSystemConfig(const QVector<EntryConfig> &config)
this->systemEntryButtons = generateEntryButtons(config); this->systemEntryButtons = generateEntryButtons(config);
} }
bool Window::eventFilter(QObject *obj, QEvent *event) bool Window::eventFilter(QObject *obj, QEvent *event)
{ {
if(obj == this->lineEdit) if(obj == this->lineEdit)
{ {
if (event->type() == QEvent::KeyPress) if (event->type() == QEvent::KeyPress)
@ -413,14 +397,12 @@ bool Window::eventFilter(QObject *obj, QEvent *event)
this->lineEdit->setText(suggestions[0] + " "); this->lineEdit->setText(suggestions[0] + " ");
this->lineEdit->setCursorPosition(this->lineEdit->text().length()+1); this->lineEdit->setCursorPosition(this->lineEdit->text().length()+1);
} }
return true; return true;
} }
} }
} }
return QObject::eventFilter(obj, event); return QObject::eventFilter(obj, event);
} }
void Window::focusInput() void Window::focusInput()

2
window.h
Fájl megtekintése

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018 Albert S. <mail at quitesimple dot org> * Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above