Skip to content

Commit

Permalink
Merge branch 'main' into 192-add-runreconnect-to-toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
epasveer committed Jan 22, 2024
2 parents 3a38c15 + 7b40a9c commit 3ae621c
Show file tree
Hide file tree
Showing 28 changed files with 119 additions and 106 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

## [2.4beta] - 2023-XX-XX
* Prepare for the 2.4 release cycle.
* Changed main icon to a more license friendly one.
All icons are now GPLv3, CC3.0, or CC4.0
* Fixed string compares for breakpoint conditions (#184)
* Added '--bs' command line option to specify a breakpoint at a source.cpp:lineno
* Fixed long tooltips text by restricting them to 100 characters. (#189)
Expand Down
58 changes: 4 additions & 54 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ License: GPL-3.0+
Files:
src/resources/seergdb_*.png
Copyright:
FlatIcon https://www.flaticon.com/free-icon/seer_2689789
License: FlatIcon Free Use License
<https://thenounproject.com/tolicon/> Toli
License: CC-BY-3.0

Files:
src/resources/icons-icons/*
Expand All @@ -49,6 +49,7 @@ Copyright:
<https://thenounproject.com/mudassar.hussain323/> mudassar.hussain323
<https://thenounproject.com/kozinn/> kozinn
<https://thenounproject.com/andre.buand10/> andre.buand10
<https://thenounproject.com/tolicon/> Toli
License: CC-BY-3.0

License: GPL-3.0+
Expand Down Expand Up @@ -96,7 +97,7 @@ License: BSD-3-clause


License: CC-BY-3.0
y http://creativecommons.org/licenses/by/3.0/
http://creativecommons.org/licenses/by/3.0/
.
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
Expand Down Expand Up @@ -693,54 +694,3 @@ License: CC-BY-4.0
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.



License: FlatIcon Free Use License

https://support.flaticon.com/s/article/Attribution-How-when-and-where?language=en_US

This is a human-readable summary of (and not a substitute for) the license.

If you are a Free user you must always attribute the author when using our resources,
below you can see the structure of the correct attribution line.

The attribution line would follow the same rules:

"Icon made by Freepik from www.flaticon.com"

You need to include one line for each author (not for each icon).

Please note that there are 18 packs created by third parties and therefore not covered by
our license:
All packs created by Google: https://www.flaticon.com/authors/google
And this pack: https://www.flaticon.com/autores/dave-gandy


Below you can find a few different scenarios and how the attribution must be inserted for
each of them:

Websites:

Insert the attribution on the page where the icon is shown. This can be placed next to
the image or on the footer of the website.

Printed products:

Paste this attribution on the final work so the authorship is known (for instance, in the
acknowledgements chapter of a book).

Apps/games:

Place the attribution on the app's credits page and on the description page on the app store.

Social Networks:

Insert the attribution line "Icon made by [author link] from @flaticon" (E.g.: Icon made by
Freepik from @flaticon) on the post or post comments.

Stickers:

It would be great if you could add the attribution line "Sticker made by Flaticon" where you use it,
but we understand that it's complicated to add this line in a chat, and therefore it's not mandatory
to add the attribution line if you use our stickers in a chat.

7 changes: 6 additions & 1 deletion src/QProgressIndicator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ QProgressIndicator::QProgressIndicator(QWidget* parent) : QWidget(parent) {
_timer = new QTimer();

connect(_timer, SIGNAL(timeout()), this, SLOT(onTimeout()));

update();
}

QProgressIndicator::~QProgressIndicator() {
Expand All @@ -36,7 +38,8 @@ void QProgressIndicator::paintEvent(QPaintEvent* e) {
Q_UNUSED(e)

if (!_timer->isActive()) {
return;
_angle = 0;
_scale = 0.0f;
}

QPainter painter(this);
Expand Down Expand Up @@ -108,6 +111,8 @@ void QProgressIndicator::setType (const QString& type) {
}else{
setType(line_rotate);
}

update();
}

QStringList QProgressIndicator::types () const {
Expand Down
5 changes: 5 additions & 0 deletions src/SeerBreakpointsBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ bool SeerBreakpointsBrowserWidget::isEmpty() const {
return (breakpointsTreeWidget->topLevelItemCount() == 0);
}

QStringList SeerBreakpointsBrowserWidget::breakpoints () const {

return QStringList();
}

void SeerBreakpointsBrowserWidget::handleText (const QString& text) {

// Don't do any work if the widget is hidden.
Expand Down
1 change: 1 addition & 0 deletions src/SeerBreakpointsBrowserWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class SeerBreakpointsBrowserWidget : public QWidget, protected Ui::SeerBreakpoin
~SeerBreakpointsBrowserWidget ();

bool isEmpty () const;
QStringList breakpoints () const;

public slots:
void handleText (const QString& text);
Expand Down
5 changes: 5 additions & 0 deletions src/SeerCatchpointsBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ bool SeerCatchpointsBrowserWidget::isEmpty() const {
return (catchpointsTreeWidget->topLevelItemCount() == 0);
}

QStringList SeerCatchpointsBrowserWidget::breakpoints () const {

return QStringList();
}

void SeerCatchpointsBrowserWidget::handleText (const QString& text) {

// Don't do any work if the widget is hidden.
Expand Down
2 changes: 2 additions & 0 deletions src/SeerCatchpointsBrowserWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <QtWidgets/QWidget>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include "ui_SeerCatchpointsBrowserWidget.h"

class SeerCatchpointsBrowserWidget : public QWidget, protected Ui::SeerCatchpointsBrowserWidgetForm {
Expand All @@ -13,6 +14,7 @@ class SeerCatchpointsBrowserWidget : public QWidget, protected Ui::SeerCatchpoin
~SeerCatchpointsBrowserWidget ();

bool isEmpty () const;
QStringList breakpoints () const;

public slots:
void handleText (const QString& text);
Expand Down
2 changes: 1 addition & 1 deletion src/SeerDebugDialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@
<string>The process pid.</string>
</property>
<property name="inputMask">
<string>999999</string>
<string>9999999</string>
</property>
<property name="placeholderText">
<string>pid</string>
Expand Down
2 changes: 0 additions & 2 deletions src/SeerGdbWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1880,8 +1880,6 @@ void SeerGdbWidget::handleGdbExecutableWorkingDirectory () {
return;
}

qDebug() << executableWorkingDirectory();

if (executableWorkingDirectory() != "") {
handleGdbCommand(QString("-environment-cd \"") + executableWorkingDirectory() + "\"");
}
Expand Down
5 changes: 5 additions & 0 deletions src/SeerPrintpointsBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ bool SeerPrintpointsBrowserWidget::isEmpty() const {
return (printpointsTreeWidget->topLevelItemCount() == 0);
}

QStringList SeerPrintpointsBrowserWidget::breakpoints () const {

return QStringList();
}

void SeerPrintpointsBrowserWidget::handleText (const QString& text) {

// Don't do any work if the widget is hidden.
Expand Down
1 change: 1 addition & 0 deletions src/SeerPrintpointsBrowserWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class SeerPrintpointsBrowserWidget : public QWidget, protected Ui::SeerPrintpoin
~SeerPrintpointsBrowserWidget ();

bool isEmpty () const;
QStringList breakpoints () const;

public slots:
void handleText (const QString& text);
Expand Down
9 changes: 5 additions & 4 deletions src/SeerStackArgumentsBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,16 @@ void SeerStackArgumentsBrowserWidget::handleText (const QString& text) {

void SeerStackArgumentsBrowserWidget::handleStoppingPointReached () {

refresh();
}

void SeerStackArgumentsBrowserWidget::refresh () {

// Don't do any work if the widget is hidden.
if (isHidden()) {
return;
}

refresh();
}

void SeerStackArgumentsBrowserWidget::refresh () {
emit refreshStackArguments();
}

Expand Down
6 changes: 6 additions & 0 deletions src/SeerStackFramesBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@ void SeerStackFramesBrowserWidget::handleStoppingPointReached () {
}

void SeerStackFramesBrowserWidget::refresh () {

// Don't do any work if the widget is hidden.
if (isHidden()) {
return;
}

emit refreshStackFrames();
}

Expand Down
9 changes: 5 additions & 4 deletions src/SeerStackLocalsBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,16 @@ void SeerStackLocalsBrowserWidget::handleText (const QString& text) {

void SeerStackLocalsBrowserWidget::handleStoppingPointReached () {

refresh();
}

void SeerStackLocalsBrowserWidget::refresh () {

// Don't do any work if the widget is hidden.
if (isHidden()) {
return;
}

refresh();
}

void SeerStackLocalsBrowserWidget::refresh () {
emit refreshStackLocals();
}

Expand Down
9 changes: 5 additions & 4 deletions src/SeerThreadFramesBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,16 @@ void SeerThreadFramesBrowserWidget::handleText (const QString& text) {

void SeerThreadFramesBrowserWidget::handleStoppingPointReached () {

refresh();
}

void SeerThreadFramesBrowserWidget::refresh () {

// Don't do any work if the widget is hidden.
if (isHidden()) {
return;
}

refresh();
}

void SeerThreadFramesBrowserWidget::refresh () {
emit refreshThreadIds();
emit refreshThreadFrames();
}
Expand Down
11 changes: 6 additions & 5 deletions src/SeerThreadIdsBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,6 @@ void SeerThreadIdsBrowserWidget::handleText (const QString& text) {

void SeerThreadIdsBrowserWidget::handleStoppingPointReached () {

// Don't do any work if the widget is hidden.
if (isHidden()) {
return;
}

refresh();
}

Expand All @@ -116,6 +111,12 @@ void SeerThreadIdsBrowserWidget::handleItemClicked (QTreeWidgetItem* item, int c
}

void SeerThreadIdsBrowserWidget::refresh () {

// Don't do any work if the widget is hidden.
if (isHidden()) {
return;
}

emit refreshThreadIds();
}

Expand Down
5 changes: 5 additions & 0 deletions src/SeerWatchpointsBrowserWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ bool SeerWatchpointsBrowserWidget::isEmpty() const {
return (watchpointsTreeWidget->topLevelItemCount() == 0);
}

QStringList SeerWatchpointsBrowserWidget::breakpoints () const {

return QStringList();
}

void SeerWatchpointsBrowserWidget::handleText (const QString& text) {

// Don't do any work if the widget is hidden.
Expand Down
2 changes: 2 additions & 0 deletions src/SeerWatchpointsBrowserWidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <QtWidgets/QWidget>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include "ui_SeerWatchpointsBrowserWidget.h"

class SeerWatchpointsBrowserWidget : public QWidget, protected Ui::SeerWatchpointsBrowserWidgetForm {
Expand All @@ -13,6 +14,7 @@ class SeerWatchpointsBrowserWidget : public QWidget, protected Ui::SeerWatchpoin
~SeerWatchpointsBrowserWidget ();

bool isEmpty () const;
QStringList breakpoints () const;

public slots:
void handleText (const QString& text);
Expand Down
1 change: 1 addition & 0 deletions src/resource.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<file>resources/thenounproject/keyboard.svg</file>
<file>resources/thenounproject/configure.svg</file>
<file>resources/thenounproject/stop.svg</file>
<file>resources/thenounproject/fortune-teller.svg</file>
<file>resources/icons-icons/gdb.png</file>
<file>resources/icons-icons/editor.png</file>
<file>resources/icons-icons/font.png</file>
Expand Down
Loading

0 comments on commit 3ae621c

Please sign in to comment.