Skip to content

Commit ca5e23e

Browse files
AlexandrKudryaMinyazevRiakov
authored
Add basic support for system theme (fix dark theme) (#1896)
* Adding system theme support * Add a valid license --------- Co-authored-by: MinyazevR <eeuriset8@gmail.com> Co-authored-by: iakov <iakov@users.noreply.github.com>
1 parent e9d7cbb commit ca5e23e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+272
-87
lines changed

‎installer/packages/trik-studio/ru.qreal.root.trik_studio_kernel/meta/prebuild-common.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ mkdir -p "$PWD"/../data/plugins/editors
1010
mkdir -p "$PWD"/../data/plugins/tools
1111
rsync -a "$BIN_DIR"/help "$PWD"/../data
1212
rsync -a "$BIN_DIR"/images "$PWD"/../data
13+
rsync -a "$BIN_DIR"/palettes "$PWD"/../data
1314
rsync -a "$BIN_DIR"/externalToolsConfig "$PWD"/../data
1415
rsync -a "$BIN_DIR"/splashscreen.png "$PWD"/../data

‎plugins/robots/common/twoDModel/src/engine/items/commentItem.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CommentItem::CommentItem(const QPointF &begin, const QPointF &end)
3939

4040
QAction *CommentItem::commentTool()
4141
{
42-
QAction * const result = new QAction(QIcon(":/icons/2d_comment.svg"), tr("Text (T)"), nullptr);
42+
auto * const result = new QAction(loadTextColorIcon(":/icons/2d_comment.svg"), tr("Text (T)"), nullptr);
4343
result->setShortcuts({QKeySequence(Qt::Key_T), QKeySequence(Qt::Key_0)});
4444
result->setCheckable(true);
4545
return result;

‎plugins/robots/common/twoDModel/src/engine/items/curveItem.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ AbstractItem *CurveItem::clone() const
5959

6060
QAction *CurveItem::curveTool()
6161
{
62-
QAction * const result = new QAction(QIcon(":/icons/2d_bezier.svg"), tr("Bezier Curve (Z)"), nullptr);
62+
QAction * const result = new QAction(loadTextColorIcon(":/icons/2d_bezier.svg"), tr("Bezier Curve (Z)"), nullptr);
6363
result->setShortcuts({QKeySequence(Qt::Key_Z), QKeySequence(Qt::Key_6)});
6464
result->setCheckable(true);
6565
return result;

‎plugins/robots/common/twoDModel/src/engine/items/imageItem.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ QPainterPath ImageItem::resizeArea() const
7575

7676
QAction *ImageItem::imageTool()
7777
{
78-
QAction * const result = new QAction(QIcon(":/icons/2d_image.svg"), tr("Image (I)"), nullptr);
78+
auto * const result = new QAction(loadTextColorIcon(":/icons/2d_image.svg"), tr("Image (I)"), nullptr);
7979
result->setShortcuts({QKeySequence(Qt::Key_I), QKeySequence(Qt::Key_Minus)});
8080
result->setCheckable(false);
8181
return result;

‎plugins/robots/common/twoDModel/src/engine/items/rectangleItem.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ AbstractItem *RectangleItem::clone() const
3737

3838
QAction *RectangleItem::rectangleTool()
3939
{
40-
QAction * const result = new QAction(QIcon(":/icons/2d_rectangle.svg"), tr("Rectangle (R)"), nullptr);
40+
QAction * const result = new QAction(loadTextColorIcon(":/icons/2d_rectangle.svg"), tr("Rectangle (R)"), nullptr);
4141
result->setShortcuts({QKeySequence(Qt::Key_R), QKeySequence(Qt::Key_7)});
4242
result->setCheckable(true);
4343
return result;

‎plugins/robots/common/twoDModel/src/engine/items/stylusItem.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ AbstractItem *StylusItem::clone() const
5555
}
5656

5757
QAction *StylusItem::stylusTool()
58-
{
59-
QAction * const result = new QAction(QIcon(":/icons/2d_pencil.png"), tr("Stylus (S)"), nullptr);
58+
{
59+
QAction * const result = new QAction(loadTextColorIcon(":/icons/2d_pencil.png"), tr("Stylus (S)"), nullptr);
6060
result->setShortcuts({QKeySequence(Qt::Key_S), QKeySequence(Qt::Key_9)});
6161
result->setCheckable(true);
6262
return result;

‎plugins/robots/common/twoDModel/src/engine/view/parts/actionsBox.cpp‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,27 @@
1313
* limitations under the License. */
1414

1515
#include "actionsBox.h"
16+
#include <qrutils/graphicsUtils/abstractItem.h>
1617

18+
using namespace graphicsUtils;
1719
using namespace twoDModel::view;
1820

1921
ActionsBox::ActionsBox(QObject *parent)
2022
: QObject(parent)
2123
, mSceneModeActions(this)
22-
, mScrollHandModeAction(new QAction(QIcon(":/icons/2d_hand.png"), tr("Hand dragging mode"), this))
24+
, mScrollHandModeAction(new QAction(AbstractItem::loadTextColorIcon(":/icons/2d_hand.png")
25+
, tr("Hand dragging mode"), this))
2326
, mMultiSelectionModeAction(new QAction(QIcon(":/icons/2d_multiselection.png"), tr("Multiselection mode"), this))
2427
, mSeparator1(new QAction(this))
2528
, mSaveWorldModelAction(new QAction(QIcon(":/icons/2d_save.png"), tr("Save world model..."), this))
2629
, mLoadWorldModelAction(new QAction(QIcon(":/icons/2d_open.png"), tr("Load world model..."), this))
2730
, mLoadWorldWithoutRobotAction(new QAction(QIcon(":/icons/2d_open.png")
2831
, tr("Load world model without robot configuration..."), this))
2932
, mSeparator2(new QAction(this))
30-
, mDeleteAllAction(new QAction(QIcon(":/icons/2d_clear.png"), tr("Clear items"), this))
31-
, mClearFloorAction(new QAction(QIcon(":/icons/2d_clear_floor.svg"), tr("Clear floor"), this))
33+
, mDeleteAllAction(new QAction(AbstractItem::loadTextColorIcon(":/icons/2d_clear.png")
34+
, tr("Clear items"), this))
35+
, mClearFloorAction(new QAction(AbstractItem::loadTextColorIcon(":/icons/2d_clear_floor.svg")
36+
, tr("Clear floor"), this))
3237
{
3338
mScrollHandModeAction->setCheckable(true);
3439
mMultiSelectionModeAction->setCheckable(true);

‎plugins/robots/common/twoDModel/src/engine/view/parts/robotItemPopup.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <QtWidgets/QGridLayout>
1818
#include <QtWidgets/QPushButton>
1919
#include <QtWidgets/QSpinBox>
20-
20+
#include <qrutils/graphicsUtils/abstractItem.h>
2121
#include <qrkernel/settingsManager.h>
2222

2323
#include "src/engine/view/scene/robotItem.h"
@@ -94,7 +94,9 @@ QWidget *RobotItemPopup::initSetStartButton()
9494

9595
QAbstractButton *RobotItemPopup::initButton(const QString &icon, const QString &toolTip)
9696
{
97-
QPushButton * const result = new QPushButton(QIcon(icon), QString(), this);
97+
QPushButton * const result = new QPushButton(
98+
graphicsUtils::AbstractItem::loadThemedIcon(icon, Qt::red), QString(), this
99+
);
98100
result->setToolTip(toolTip);
99101
result->setFlat(true);
100102
result->setFixedSize(24, 24);

‎plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,12 @@ void TwoDModelWidget::initWidget()
223223
};
224224
toggleRulers();
225225

226+
mUi->speedUpButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_plus.svg"));
227+
mUi->speedDownButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_minus.svg"));
228+
mUi->initialStateButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_robot_back.png"));
229+
mUi->trainingModeButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_training.svg"));
230+
mUi->toggleDetailsButton->setIcon(AbstractItem::loadTextColorIcon(":/icons/2d_left.png"));
231+
226232
connect(mUi->gridParametersBox, &twoDModel::view::GridParameters::parametersChanged
227233
, &*mScene, [&]() { mScene->update(); });
228234
connect(mUi->gridParametersBox, &GridParameters::parametersChanged, this, toggleRulers);

‎plugins/robots/interpreters/interpreterCore/src/managers/actionsManager.cpp‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
#include "interpreterCore/managers/actionsManager.h"
1616

1717
#include <QtCore/QSignalMapper>
18-
18+
#include <QtWidgets/QApplication>
19+
#include <QPainter>
1920
#include <qrkernel/settingsManager.h>
2021
#include <kitBase/robotModel/robotModelUtils.h>
22+
#include <qrutils/graphicsUtils/abstractItem.h>
2123

2224
using namespace interpreterCore;
2325

@@ -32,8 +34,14 @@ ActionsManager::ActionsManager(KitPluginManager &kitPluginManager, RobotModelMan
3234
, mConnectToRobotAction(new QAction(QIcon(":/icons/robots_connect.svg"), QObject::tr("Connect to robot"), this))
3335
, mRobotSettingsAction(QIcon(":/icons/robots_settings.png"), QObject::tr("Robot settings"), this)
3436
, mExportExerciseAction(QIcon(), QObject::tr("Save as task..."), this)
35-
, mDebugModeAction(new QAction(QIcon(":/icons/main_tabbar_debug.svg"), QObject::tr("Debug"), this))
36-
, mEditModeAction(new QAction(QIcon(":/icons/main_tabbar_edit.svg"), QObject::tr("Edit"), this))
37+
, mDebugModeAction(new QAction(
38+
graphicsUtils::AbstractItem::loadTextColorIcon(":/icons/main_tabbar_debug.svg"),
39+
QObject::tr("Debug"),
40+
this))
41+
, mEditModeAction(new QAction(
42+
graphicsUtils::AbstractItem::loadTextColorIcon(":/icons/main_tabbar_edit.svg"),
43+
QObject::tr("Edit"),
44+
this))
3745
, mHomeAction(new QAction(QIcon(":/icons/home.svg"), tr("To main page"), this))
3846
, mSeparator1(this)
3947
, mSeparator2(this)

0 commit comments

Comments
 (0)