Attachment 12607 Details for Bug 45004 – Патч поведения компилятора в Linux

[patch] Патч поведения компилятора в Linux

simulide-1.0.1-linux-fixes.patch (text/plain), 4.06 KB, created by w00zy on 2023-02-23 12:20:37 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: w00zy

Created: 2023-02-23 12:20:37 MSK

Size: 4.06 KB

patch

obsolete

>diff -ru old/resources/translations/simulide_ru.ts new/resources/translations/simulide_ru.ts
>--- old/resources/translations/simulide_ru.ts	2023-02-23 10:53:38.359999000 +0300
>+++ new/resources/translations/simulide_ru.ts	2023-02-22 19:12:36.196327137 +0300
>@@ -1724,18 +1724,12 @@
>         <translation>ÐÐ¾ÑÐ»ÐµÐ´Ð½ÑÑ ÑÑÐµÐ¼Ð°</translation>
>     </message>
>     <message>
>-        <source>
>-Can&apos;t find file:
>-</source>
>-        <translation>
>-ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°Ð¹Ð»:
>-</translation>
>+        <source>Can&apos;t find file:</source>
>+        <translation>ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ°Ð¹Ð»:</translation>
>     </message>
>     <message>
>-        <source>Do you want to remove it from Recent Files?
>-</source>
>-        <translation>ÐÑ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÐµÐ³Ð¾ Ð¸Ð· Ð½ÐµÐ´Ð°Ð²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð²?
>-</translation>
>+        <source>Do you want to remove it from Recent Files?</source>
>+        <translation>ÐÑ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÐµÐ³Ð¾ Ð¸Ð· Ð½ÐµÐ´Ð°Ð²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð²?</translation>
>     </message>
> </context>
> <context>
>diff -ru old/SimulIDE.pro new/SimulIDE.pro
>--- old/SimulIDE.pro	2023-02-23 10:53:38.359999000 +0300
>+++ new/SimulIDE.pro	2023-02-23 11:03:45.252304486 +0300
>@@ -100,8 +100,7 @@
> CONFIG += no_qml_debug
> CONFIG *= c++11
> 
>-REV_NO = $$system( bzr revno )
>-DEFINES += REVNO=\\\"$$REV_NO\\\"
>+DEFINES += REVNO="1425"
> 
> DEFINES += MAINMODULE_EXPORT=
> DEFINES += APP_VERSION=\\\"$$VERSION$$RELEASE\\\"
>@@ -141,7 +140,7 @@
>         $(COPY_DIR) ../resources/examples $$TARGET_PREFIX/simulide.app/Contents/MacOs;
> }
> 
>-runLrelease.commands = lrelease ../resources/translations/*.ts;
>+runLrelease.commands = lrelease-qt5 ../resources/translations/*.ts;
> QMAKE_EXTRA_TARGETS += runLrelease
> QMAKE_EXTRA_TARGETS += copy2dest
> PRE_TARGETDEPS      += runLrelease
>diff -ru old/src/gui/editorwidget/debuggers/inodebugger.cpp new/src/gui/editorwidget/debuggers/inodebugger.cpp
>--- old/src/gui/editorwidget/debuggers/inodebugger.cpp	2023-02-23 10:53:38.359999000 +0300
>+++ new/src/gui/editorwidget/debuggers/inodebugger.cpp	2023-02-23 11:24:12.939909621 +0300
>@@ -20,6 +20,16 @@
> #include <QApplication>
> #include <QSettings>
> 
>+#ifdef Q_OS_UNIX
>+/*
>+w00zy Thu Feb 23 11:22:40 MSK 2023
>+Linux does not encourage writing user data to the /usr directory. 
>+Perhaps you need to save temporary compiler files in your home directory? 
>+Possibly QStandardPaths::CacheLocation ?
>+*/
>+#include <QStandardPaths>
>+#endif
>+
> #include "inodebugger.h"
> #include "outpaneltext.h"
> #include "mainwindow.h"
>@@ -39,7 +49,11 @@
>     m_version = 0;
>     m_Ardboard = Uno;
>     m_ArdboardList << "uno" << "megaADK" << "nano" << "diecimila" << "leonardo" << "custom";
>+    #ifndef Q_OS_UNIX
>     m_buildPath = MainWindow::self()->getFilePath("data/codeeditor/buildIno");
>+    #else
>+    m_buildPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/codeeditor/buildIno";
>+    #endif
> }
> InoDebugger::~InoDebugger() {}
> 
>@@ -134,6 +148,14 @@
>     QString cCachePath = m_buildPath+"/cache";
> 
>     QDir dir( m_buildPath );
>+
>+    #ifdef Q_OS_UNIX
>+    if( !QFile::exists( m_buildPath ))
>+    {
>+        dir.mkpath( m_buildPath );
>+    }
>+    #endif
>+
>     bool b = dir.cd( "build" );
>     if( b ) dir.removeRecursively();   // Remove old files
>     dir.mkpath( cBuildPath );  // Create build folder
>diff -ru old/src/gui/editorwidget/editorwidget.cpp new/src/gui/editorwidget/editorwidget.cpp
>--- old/src/gui/editorwidget/editorwidget.cpp	2023-02-23 10:53:38.359999000 +0300
>+++ new/src/gui/editorwidget/editorwidget.cpp	2023-02-23 11:14:41.284007177 +0300
>@@ -627,7 +627,8 @@
> 
>     for( int i=0; i<MaxRecentFiles; i++ ) m_fileMenu.addAction( recentFileActs[i] );
>     QToolButton* fileButton = new QToolButton( this );
>-    fileButton->setStatusTip( tr("Last Circuits") );
>+    // fileButton->setStatusTip( tr("Last Circuits") ); // fix me? This not list item? This menu button
>+    fileButton->setToolTip( tr("Last Circuits") ); // w00zy possible fix.
>     fileButton->setMenu( &m_fileMenu );
>     fileButton->setIcon( QIcon(":/lastfiles.png") );
>     fileButton->setPopupMode( QToolButton::InstantPopup );

Actions: View | Diff

Attachments on bug 45004: 12352 | 12353 | 12607