Attachment #12607 for bug #45004

View | Details | Raw Unified | Return to bug 45004
Collapse All | Expand All




        <translation>Последняя схема</translation>
    </message>
    <message>
        <source>Can&apos;t find file:</source>
        <translation>Не удалось найти файл:</translation>
</source>
        <translation>
Не удалось найти файл:
</translation>
    </message>
    <message>
        <source>Do you want to remove it from Recent Files?</source>
        <translation>Вы хотите удалить его из недавних файлов?</translation>
        <translation>Вы хотите удалить его из недавних файлов?
</translation>
    </message>
</context>
<context>

Lines 100-107 Link Here

(-)old/SimulIDE.pro (-3 / +2 lines)
100	CONFIG += no_qml_debug	100	CONFIG += no_qml_debug
101	CONFIG *= c++11	101	CONFIG *= c++11
102		102
103	REV_NO = $$system( bzr revno )	103	DEFINES += REVNO="1425"
104	DEFINES += REVNO=\\\"$$REV_NO\\\"
105		104
106	DEFINES += MAINMODULE_EXPORT=	105	DEFINES += MAINMODULE_EXPORT=
107	DEFINES += APP_VERSION=\\\"$$VERSION$$RELEASE\\\"	106	DEFINES += APP_VERSION=\\\"$$VERSION$$RELEASE\\\"
Lines 141-147 Link Here
141	$(COPY_DIR) ../resources/examples $$TARGET_PREFIX/simulide.app/Contents/MacOs;	140	$(COPY_DIR) ../resources/examples $$TARGET_PREFIX/simulide.app/Contents/MacOs;
142	}	141	}
143		142
144	runLrelease.commands = lrelease ../resources/translations/*.ts;	143	runLrelease.commands = lrelease-qt5 ../resources/translations/*.ts;
145	QMAKE_EXTRA_TARGETS += runLrelease	144	QMAKE_EXTRA_TARGETS += runLrelease
146	QMAKE_EXTRA_TARGETS += copy2dest	145	QMAKE_EXTRA_TARGETS += copy2dest
147	PRE_TARGETDEPS += runLrelease	146	PRE_TARGETDEPS += runLrelease

Lines 20-25 Link Here

(-)old/src/gui/editorwidget/debuggers/inodebugger.cpp (+22 lines)
20	#include <QApplication>	20	#include <QApplication>
21	#include <QSettings>	21	#include <QSettings>
22		22
		23	#ifdef Q_OS_UNIX
		24	/*
		25	w00zy Thu Feb 23 11:22:40 MSK 2023
		26	Linux does not encourage writing user data to the /usr directory.
		27	Perhaps you need to save temporary compiler files in your home directory?
		28	Possibly QStandardPaths::CacheLocation ?
		29	*/
		30	#include <QStandardPaths>
		31	#endif
		32
23	#include "inodebugger.h"	33	#include "inodebugger.h"
24	#include "outpaneltext.h"	34	#include "outpaneltext.h"
25	#include "mainwindow.h"	35	#include "mainwindow.h"
Lines 39-45 Link Here
39	m_version = 0;	49	m_version = 0;
40	m_Ardboard = Uno;	50	m_Ardboard = Uno;
41	m_ArdboardList << "uno" << "megaADK" << "nano" << "diecimila" << "leonardo" << "custom";	51	m_ArdboardList << "uno" << "megaADK" << "nano" << "diecimila" << "leonardo" << "custom";
		52	#ifndef Q_OS_UNIX
42	m_buildPath = MainWindow::self()->getFilePath("data/codeeditor/buildIno");	53	m_buildPath = MainWindow::self()->getFilePath("data/codeeditor/buildIno");
		54	#else
		55	m_buildPath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/codeeditor/buildIno";
		56	#endif
43	}	57	}
44	InoDebugger::~InoDebugger() {}	58	InoDebugger::~InoDebugger() {}
45		59
Lines 134-139 Link Here
134	QString cCachePath = m_buildPath+"/cache";	148	QString cCachePath = m_buildPath+"/cache";
135		149
136	QDir dir( m_buildPath );	150	QDir dir( m_buildPath );
		151
		152	#ifdef Q_OS_UNIX
		153	if( !QFile::exists( m_buildPath ))
		154	{
		155	dir.mkpath( m_buildPath );
		156	}
		157	#endif
		158
137	bool b = dir.cd( "build" );	159	bool b = dir.cd( "build" );
138	if( b ) dir.removeRecursively(); // Remove old files	160	if( b ) dir.removeRecursively(); // Remove old files
139	dir.mkpath( cBuildPath ); // Create build folder	161	dir.mkpath( cBuildPath ); // Create build folder

Lines 627-633 Link Here

(-)old/src/gui/editorwidget/editorwidget.cpp (-1 / +2 lines)
627		627
628	for( int i=0; i<MaxRecentFiles; i++ ) m_fileMenu.addAction( recentFileActs[i] );	628	for( int i=0; i<MaxRecentFiles; i++ ) m_fileMenu.addAction( recentFileActs[i] );
629	QToolButton* fileButton = new QToolButton( this );	629	QToolButton* fileButton = new QToolButton( this );
630	fileButton->setStatusTip( tr("Last Circuits") );	630	// fileButton->setStatusTip( tr("Last Circuits") ); // fix me? This not list item? This menu button
		631	fileButton->setToolTip( tr("Last Circuits") ); // w00zy possible fix.
631	fileButton->setMenu( &m_fileMenu );	632	fileButton->setMenu( &m_fileMenu );
632	fileButton->setIcon( QIcon(":/lastfiles.png") );	633	fileButton->setIcon( QIcon(":/lastfiles.png") );
633	fileButton->setPopupMode( QToolButton::InstantPopup );	634	fileButton->setPopupMode( QToolButton::InstantPopup );

Return to bug 45004

Lines 1724-1741 Link Here

(-)old/resources/translations/simulide_ru.ts (-10 / +4 lines)
1724	<translation>Последняя схема</translation>	1724	<translation>Последняя схема</translation>
1725	</message>	1725	</message>
1726	<message>	1726	<message>
1727	<source>	1727	<source>Can't find file:</source>
1728	Can't find file:	1728	<translation>Не удалось найти файл:</translation>
1729	</source>
1730	<translation>
1731	Не удалось найти файл:
1732	</translation>
1733	</message>	1729	</message>
1734	<message>	1730	<message>
1735	<source>Do you want to remove it from Recent Files?	1731	<source>Do you want to remove it from Recent Files?</source>
1736	</source>	1732	<translation>Вы хотите удалить его из недавних файлов?</translation>
1737	<translation>Вы хотите удалить его из недавних файлов?
1738	</translation>
1739	</message>	1733	</message>
1740	</context>	1734	</context>
1741	<context>	1735	<context>