SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
Frans Schreuder 2012-08-08 14:28:03 +02:00
parent dfe82c0d75
commit 87c5afa707
66 changed files with 890 additions and 10294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,11 +1,8 @@
<<<<<<< HEAD
=======
2011-03-18 Stefan Jahn <stefan@lkcc.org>
* configure.ac: Released version 0.0.16 and bumped up to version
0.0.17.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2009-04-27 Stefan Jahn <stefan@lkcc.org>
* qucs-filter-v2: Added preliminary 2nd version of qucs-filter

14
NEWS
View File

@ -1,11 +1,7 @@
--
-- NEWS
--
<<<<<<< HEAD
-- Copyright (C) 2003-2010 Stefan Jahn <stefan@lkcc.org>
=======
-- Copyright (C) 2003-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
--
-- This is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -27,11 +23,6 @@ This file lists user visible changes that were made between releases. For
more verbose descriptions of these and internal changes see the ChangeLog
files.
<<<<<<< HEAD
Version 0.0.16
--------------
=======
Version 0.0.17
--------------
@ -40,7 +31,6 @@ Version 0.0.16
--------------
* implementation of interactive GNU Octave connection
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
* support for C++ code export of symbol drawings associated with
Verilog-A files
* direct association of symbol drawings to Verilog-HDL, Verilog-A
@ -48,12 +38,8 @@ Version 0.0.16
* added Verilog-HDL and Verilog-A syntax highlighting in text documents
* support for pre-compiled VHDL modules and libraries made from user
written VHDL code
<<<<<<< HEAD
* new components: NIGBT, HICUM L2 v2.24, HICUM L0 v1.2g
=======
* new components: NIGBT, HICUM L2 v2.24, HICUM L0 v1.2g, tunnel diode,
ideal coupled transmission line, hybrid, HICUM L0 v1.3
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
* translation into Kazakh
* allow equations in Verilog-HDL and VHDL subcircuits

16
README
View File

@ -1,11 +1,7 @@
--
-- README
--
<<<<<<< HEAD
-- Copyright (C) 2003, 2005 Stefan Jahn <stefan@lkcc.org>
=======
-- Copyright (C) 2003, 2005, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
--
-- This is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -76,17 +72,6 @@ file INSTALL included in this distribution.
Please note: Users of the FreeBSD OS may use a GNU make (probably gmake)
to compile and install the package.
<<<<<<< HEAD
Getting the latest CVS snapshot
===============================
You can always get the latest Qucs version from our CVS repository.
Please use an official release if you want to work with Qucs. The CVS
version might not even compile.
$ cvs -z3 -d:pserver:anonymous@qucs.cvs.sourceforge.net:/cvsroot/qucs \
co qucs
=======
Getting the latest SVN snapshot
===============================
@ -95,7 +80,6 @@ Please use an official release if you want to work with Qucs. The SVN
version might not even compile.
$ svn co https://qucs.svn.sourceforge.net/svnroot/qucs/trunk/qucs
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Press 'Enter' when asked for a password. Run `sh autogen.sh' and
`configure' with the appropriate options. Maintainance currently

12
RELEASE
View File

@ -3,11 +3,7 @@
--
-- release instructions.
--
<<<<<<< HEAD
-- Copyright (C) 2004, 2006 Stefan Jahn <stefan@lkcc.org>
=======
-- Copyright (C) 2004, 2006, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
--
-- This is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -42,21 +38,13 @@ Distribution process:
command `automake -a -f -c' with latest automake version installed.
- Run `make distclean', `sh autogen.sh' and `make all'.
- Run `make distcheck'.
<<<<<<< HEAD
- Check this status into CVS and tag it.
=======
- Check this status into SVN and tag it.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
* Bump up version.
- Add a ChangeLog entry in toplevel directory.
- Add new section in NEWS.
- Bump up version number in `configure.ac'.
<<<<<<< HEAD
- Check into CVS.
=======
- Check into SVN.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
* Distribute the package.
- Upload the package to the SourceForge server and add a News item.

4
autodsp.sh
View File

@ -19,11 +19,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
# Boston, MA 02110-1301, USA.
#
<<<<<<< HEAD
# $Id: autodsp.sh,v 1.1 2007/02/25 17:04:18 ela Exp $
=======
# $Id$
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
use strict;

10
configure.ac
View File

@ -2,11 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
<<<<<<< HEAD
AC_INIT(qucs,0.0.16,qucs-bugs@lists.sourceforge.net)
=======
AC_INIT(qucs,0.0.17,qucs-bugs@lists.sourceforge.net)
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
AC_CONFIG_SRCDIR([qucs/qucs.cpp])
AC_CONFIG_HEADERS([config.h])
@ -270,13 +266,10 @@ DOC_PATH="$prefix/share/qucs/docs/"
AC_DEFINE_UNQUOTED([DOCDIR], ["$DOC_PATH"],
[Where the documentation files go.])
unset DOC_PATH
<<<<<<< HEAD
=======
OCTAVE_PATH="$prefix/share/qucs/octave/"
AC_DEFINE_UNQUOTED([OCTAVEDIR], ["$OCTAVE_PATH"],
[Where the octave script files go.])
unset OCTAVE_PATH
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
dnl Definitions at top of <config.h>.
AH_TOP([
@ -323,10 +316,7 @@ AC_CONFIG_FILES([Makefile
qucs-attenuator/bitmaps/Makefile
qucs/Makefile
qucs/bitmaps/Makefile
<<<<<<< HEAD
=======
qucs/octave/Makefile
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
qucs/components/Makefile
qucs/diagrams/Makefile
qucs/paintings/Makefile

11
contrib/innosetup/freehdl.iss
View File

@ -1,11 +1,7 @@
;
; freehdl.iss - inno Setup script file
;
<<<<<<< HEAD
; Copyright (C) 2006, 2008 Stefan Jahn <stefan@lkcc.org>
=======
; Copyright (C) 2006, 2008, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
;
; This is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
@ -27,17 +23,10 @@
; NOTE: additional files: bin/libregex.dll lib/libregex.a
;
<<<<<<< HEAD
#define RELEASE "0.0.7"
#define BASENAME "freehdl"
#define APPNAME "FreeHDL"
#define APPVERNAME "FreeHDL 0.0.7 binary package for Win32"
=======
#define RELEASE "0.0.8"
#define BASENAME "freehdl"
#define APPNAME "FreeHDL"
#define APPVERNAME "FreeHDL 0.0.8 binary package for Win32"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#define URL "http://www.freehdl.seul.org"
#define TREE "C:\home\freetree"

11
contrib/innosetup/qucs.iss
View File

@ -1,11 +1,7 @@
;
; qucs.iss - inno Setup script file
;
<<<<<<< HEAD
; Copyright (C) 2005, 2006, 2007, 2008 Stefan Jahn <stefan@lkcc.org>
=======
; Copyright (C) 2005-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
;
; This is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
@ -23,17 +19,10 @@
; Boston, MA 02110-1301, USA.
;
<<<<<<< HEAD
#define RELEASE "0.0.14"
#define BASENAME "qucs"
#define APPNAME "Qucs"
#define APPVERNAME "Quite Universal Circuit Simulator 0.0.14 binary package for Win32"
=======
#define RELEASE "0.0.16"
#define BASENAME "qucs"
#define APPNAME "Qucs"
#define APPVERNAME "Quite Universal Circuit Simulator 0.0.16 binary package for Win32"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#define URL "http://qucs.sourceforge.net"
#define TREE "C:\home\qucstree"

3
qucs-help/ChangeLog
View File

@ -1,11 +1,8 @@
<<<<<<< HEAD
=======
2011-03-11 Stefan Jahn <stefan@lkcc.org>
* docs/en/octave.html: Added short description of Octave
interface.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2009-10-08 Stefan Jahn <stefan@lkcc.org>
* docs/cs/index.html: Updated Czech translations of internal help

8
qucs-help/docs/en/Makefile.am
View File

@ -4,11 +4,7 @@
#
# Automake input file.
#
<<<<<<< HEAD
# Copyright (C) 2004, 2005, 2006 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2004, 2005, 2006, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -28,11 +24,7 @@
HTML = index.html short.html start.html mathfunc.html subcircuit.html \
programs.html internal.html characters.html matching.html start_digi.html \
<<<<<<< HEAD
start_opt.html
=======
start_opt.html octave.html
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
PIC = qucsmain.png paste.png wire.png select.png contab.png subcircuit.png \
qucsdigi.png optimization1.png optimization2.png optimization3.png \
optimization4.png optimization5.png optimization6.png optimization7.png \

3
qucs-help/docs/en/index.html
View File

@ -20,10 +20,7 @@ Help Index<br><br>
<a href="start.html">Getting Started - Analog Simulation</a><br>
<a href="start_digi.html">Getting Started - Digital Simulation</a><br>
<a href="start_opt.html">Getting Started - Optimization</a><br>
<<<<<<< HEAD
=======
<a href="octave.html">Getting Started - Octave Scripts</a><br>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<a href="short.html">Short Description of Actions</a><br>
<a href="subcircuit.html">Working with Subcircuits</a><br>
<a href="mathfunc.html">Short Description of mathematical Functions</a><br>

3
qucs-lib/ChangeLog
View File

@ -1,10 +1,7 @@
<<<<<<< HEAD
=======
2011-03-01 Stefan Jahn <stefan@lkcc.org>
* library/Ideal.lib: Fixed HardLimiter and Abs components.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2010-10-23 Stefan Jahn <stefan@lkcc.org>
* symbolwidget.cpp (createSymbol): Adjusted symbol for new HICUM

8
qucs-lib/library/Ideal.lib
View File

@ -394,11 +394,7 @@ EDD:D1 _net2 gnd gnd _net0 I1="D1.I1" Q1="D1.Q1" I2="D1.I2" Q2="D1.Q2"
</Model>
<Symbol>
<Line -20 -20 0 40 #000080 2 1>
<<<<<<< HEAD
<.PortSym 30 0 3 180>
=======
<.PortSym 30 0 2 180>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<Line 30 0 -10 0 #000080 2 1>
<Line -30 0 10 0 #000080 2 1>
<Line -20 -20 40 0 #000080 2 1>
@ -578,11 +574,7 @@ EDD:D1 _net2 gnd gnd _net0 I1="D1.I1" Q1="D1.Q1" I2="D1.I2" Q2="D1.Q2"
.Def:End
</Model>
<Symbol>
<<<<<<< HEAD
<.PortSym 30 0 3 180>
=======
<.PortSym 30 0 2 180>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<Line -30 0 10 0 #000080 2 1>
<.PortSym -30 0 1 0>
<Line 20 0 10 0 #000080 2 1>

4
qucs-lib/symbolwidget.cpp
View File

@ -263,11 +263,7 @@ int SymbolWidget::createSymbol(const QString& Lib_, const QString& Comp_)
else if(Comp == "hicumL2V2p1" || Comp == "hic2_full" ||
Comp == "hic0_full" || Comp == "hicumL0V1p2" ||
Comp == "hicumL2V2p23" || Comp == "hicumL2V2p24" ||
<<<<<<< HEAD
Comp == "hicumL0V1p2g") {
=======
Comp == "hicumL0V1p2g" || Comp == "hicumL0V1p3") {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// normal bipolar
Lines.append(new Line(-10,-15,-10, 15,QPen(QPen::darkBlue,3)));
Lines.append(new Line(-30, 0,-10, 0,QPen(QPen::darkBlue,2)));

3
qucs-transcalc/ChangeLog
View File

@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
2011-04-03 Stefan Jahn <stefan@lkcc.org>
* rectwaveguide.cpp (analyze): Fixed calculation of Z0 in
@ -10,7 +8,6 @@
* coax.cpp (alphac_coax): Fixed factor of 2 in conductor loss
calculation.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2009-05-14 Stefan Jahn <stefan@lkcc.org>
* coax.cpp (show_results): Fixed computation of cut-off

8
qucs-transcalc/coax.cpp
View File

@ -3,11 +3,7 @@
*
* Copyright (C) 2001 Gopal Narayanan <gopal@astro.umass.edu>
* Copyright (C) 2002 Claudio Girardi <claudio.girardi@ieee.org>
<<<<<<< HEAD
* Copyright (C) 2005, 2006, 2009 Stefan Jahn <stefan@lkcc.org>
=======
* Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -104,11 +100,7 @@ double coax::alphac_coax ()
{
double ac, Rs;
Rs = sqrt((M_PI * f * mur* MU0)/sigma);
<<<<<<< HEAD
ac = (0.5 * sqrt(er)) * (((1/din) + (1/dout))/log(dout/din)) * (Rs/ZF0);
=======
ac = sqrt(er) * (((1/din) + (1/dout))/log(dout/din)) * (Rs/ZF0);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
ac = ac * 20.0 / log(10.0);
return ac;
}

65
qucs-transcalc/rectwaveguide.cpp
View File

@ -43,11 +43,7 @@ rectwaveguide::~rectwaveguide()
double rectwaveguide::kval ()
{
double kval;
<<<<<<< HEAD
kval = 2. * M_PI * f * sqrt(mur * er)/C0;
=======
kval = 2.0 * M_PI * f * sqrt (mur * er) / C0;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return kval;
}
@ -58,11 +54,7 @@ double rectwaveguide::kval ()
double rectwaveguide::kc (int m, int n)
{
double kcval;
<<<<<<< HEAD
kcval = sqrt(pow((m*M_PI/a),2.0) + pow((n*M_PI/b),2.0));
=======
kcval = sqrt (pow ((m * M_PI / a), 2.0) + pow ((n * M_PI / b), 2.0));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return kcval;
}
@ -73,11 +65,7 @@ double rectwaveguide::kc (int m, int n)
double rectwaveguide::fc (int m, int n)
{
double fcval;
<<<<<<< HEAD
fcval = (kc(m, n) * C0)/ (2 * M_PI * sqrt(mur * er));
=======
fcval = kc (m, n) * C0 / (2.0 * M_PI * sqrt (mur * er));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return fcval;
}
@ -91,17 +79,10 @@ double rectwaveguide::alphac ()
double ac;
short m, n, mmax, nmax;
<<<<<<< HEAD
Rs = sqrt((M_PI * f * mur* MU0)/sigma);
k = kval();
ac = 0.0;
mmax = (int) floor (f/fc(1,0));
=======
Rs = sqrt ((M_PI * f * mur * MU0) / sigma);
k = kval ();
ac = 0.0;
mmax = (int) floor (f / fc (1,0));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
nmax = mmax;
/* below from Ramo, Whinnery & Van Duzer */
@ -139,11 +120,7 @@ double rectwaveguide::alphac ()
}
}
<<<<<<< HEAD
ac = ac * 20.0 * log10(exp(1.)); /* convert from Np/m to db/m */
=======
ac = ac * 20.0 * log10 (exp (1.0)); /* convert from Np/m to db/m */
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return ac;
}
@ -153,13 +130,8 @@ double rectwaveguide::alphac ()
double rectwaveguide::alphac_cutoff ()
{
double acc;
<<<<<<< HEAD
acc = sqrt(pow(kc(1,0),2.0) - pow(kval(),2.0));
acc = 20 * log10(exp(1.0)) * acc;
=======
acc = sqrt (pow (kc(1,0), 2.0) - pow (kval (), 2.0));
acc = 20 * log10 (exp (1.0)) * acc;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return acc;
}
@ -171,19 +143,11 @@ double rectwaveguide::alphad()
double k, beta;
double ad;
<<<<<<< HEAD
k = kval();
beta = sqrt(pow(k,2.) - pow(kc(1,0),2.0));
ad = (pow(k,2.0) * tand)/(2.0 * beta);
ad = ad * 20.0 * log10(exp(1.)); /* convert from Np/m to db/m */
=======
k = kval ();
beta = sqrt (pow (k, 2.0) - pow (kc (1,0), 2.0));
ad = (pow (k, 2.0) * tand) / (2.0 * beta);
ad = ad * 20.0 * log10 (exp (1.0)); /* convert from Np/m to db/m */
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return ad;
}
@ -222,10 +186,6 @@ void rectwaveguide::get_rectwaveguide_elec ()
ang_l = getProperty ("Ang_l", UNIT_ANG, ANG_RAD);
}
<<<<<<< HEAD
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
/*
* get_rectwaveguide_phys
* get and assign rectwaveguide physical parameters
@ -238,10 +198,6 @@ void rectwaveguide::get_rectwaveguide_phys ()
l = getProperty ("L", UNIT_LENGTH, LENGTH_M);
}
<<<<<<< HEAD
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
/*
* analyze - analysis function
*/
@ -260,26 +216,6 @@ void rectwaveguide::analyze ()
/* Get and assign physical parameters */
get_rectwaveguide_phys();
<<<<<<< HEAD
k = kval();
if (kc(1,0) <= k) {
/*propagating modes */
beta = sqrt(pow(k,2.) - pow(kc(1,0),2.0));
lambda_g = (2. * M_PI)/beta;
/* Z0 = (k * ZF0)/beta; */
Z0 = 2.0 * ZF0 * (b/a) * 1/
sqrt(1.0 - pow((fc(1,0)/f),2.0));
/* calculate electrical angle */
lambda_g = (2. * M_PI)/beta;
ang_l = (2.0 * M_PI * l)/lambda_g; /* in radians */
atten_cond = alphac () * l;
atten_dielectric = alphad () * l;
er_eff = (1.0 - pow((fc(1,0)/f),2.0));
} else {
/*evanascent modes */
=======
k = kval ();
if (kc (1,0) <= k) {
@ -297,7 +233,6 @@ void rectwaveguide::analyze ()
er_eff = (1.0 - pow ((fc (1,0) / f), 2.0));
} else {
/* evanascent modes */
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Z0 = 0;
ang_l = 0;
er_eff = 0;

3
qucs/ChangeLog
View File

@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
2011-03-18 Stefan Jahn <stefan@lkcc.org>
* qucs.cpp (slotOpenContent): Allowing double click on .vhd files.
@ -72,7 +70,6 @@
* dialogs/simmessage.cpp (startSimulator): Avoid outputting file
names of library file include names into the netlist.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2010-04-14 Stefan Jahn <stefan@lkcc.org>
* schematic.cpp (setName): Handling schematic etc. filenames with

16
qucs/Makefile.am
View File

@ -4,11 +4,7 @@
#
# Automake input file.
#
<<<<<<< HEAD
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2004-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -26,11 +22,7 @@
# Boston, MA 02110-1301, USA.
#
<<<<<<< HEAD
SUBDIRS = bitmaps components diagrams paintings dialogs
=======
SUBDIRS = bitmaps components diagrams paintings dialogs octave
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if COND_WIN32
bin_SCRIPTS = qucsdigi.bat qucsveri.bat qucsdigilib.bat
@ -40,21 +32,13 @@ endif
bin_PROGRAMS = qucs
<<<<<<< HEAD
MOCHEADERS = qucs.h schematic.h textdoc.h
=======
MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
qucs_SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \
qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \
viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \
<<<<<<< HEAD
schematic_file.cpp syntax.cpp module.cpp
=======
schematic_file.cpp syntax.cpp module.cpp octave_window.cpp
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
nodist_qucs_SOURCES = $(MOCFILES)

8
qucs/bitmaps/Makefile.am
View File

@ -4,11 +4,7 @@
#
# Automake input file.
#
<<<<<<< HEAD
# Copyright (C) 2004, 2005, 2007, 2008, 2009 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2004-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -57,11 +53,7 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png \
dmux4to16.png ha1b.png fa1b.png fa2b.png pad2bit.png pad3bit.png \
pad4bit.png binarytogrey4bit.png greytobinary4bit.png comp_1bit.png \
comp_2bit.png comp_4bit.png hpribin4bit.png msrstub.png phototransistor.png \
<<<<<<< HEAD
rlcg.png nigbt.png
=======
rlcg.png nigbt.png hybrid.png ctline.png tunneldiode.png
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
# toolbar pictures
PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \

3
qucs/components/ChangeLog
View File

@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
2011-04-05 Stefan Jahn <stefan@lkcc.org>
* component.cpp (getComponentFromName): Fixing wrong rotation /
@ -18,7 +16,6 @@
* tunneldiode.cpp (TunnelDiode): Added tunnel diode model.
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
2010-10-23 Stefan Jahn <stefan@lkcc.org>
* hicumL0V1p2g.cpp (hicumL0V1p2g): Added new HICUM/L0 v1.2g model.

12
qucs/components/Makefile.am
View File

@ -4,11 +4,7 @@
#
# Automake input file.
#
<<<<<<< HEAD
# Copyright (C) 2004, 2007, 2008, 2009, 2010 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2004-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -61,11 +57,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
pad2bit.cpp pad3bit.cpp pad4bit.cpp binarytogrey4bit.cpp vafile.cpp \
greytobinary4bit.cpp comp_1bit.cpp comp_2bit.cpp comp_4bit.cpp \
hpribin4bit.cpp msrstub.cpp phototransistor.cpp nigbt.cpp hicumL2V2p24.cpp \
<<<<<<< HEAD
hicumL0V1p2g.cpp
=======
hicumL0V1p2g.cpp hybrid.cpp ctline.cpp tunneldiode.cpp hicumL0V1p3.cpp
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
nodist_libcomponents_a_SOURCES = $(MOCFILES)
@ -93,12 +85,8 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \
andor4x4.h dmux2to4.h dmux3to8.h dmux4to16.h ha1b.h fa1b.h fa2b.h pad2bit.h \
pad3bit.h pad4bit.h binarytogrey4bit.h greytobinary4bit.h comp_1bit.h \
comp_2bit.h comp_4bit.h hpribin4bit.h msrstub.h phototransistor.h nigbt.h \
<<<<<<< HEAD
vafile.h hicumL2V2p24.h hicumL0V1p2g.h
=======
vafile.h hicumL2V2p24.h hicumL0V1p2g.h hybrid.h ctline.h tunneldiode.h \
hicumL0V1p3.h
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs

3
qucs/components/component.cpp
View File

@ -1522,10 +1522,7 @@ Component* getComponentFromName(QString& Line)
cstr.remove (0,1); // remove leading "<"
if (cstr == "Lib") c = new LibComp ();
else if (cstr == "Eqn") c = new Equation ();
<<<<<<< HEAD
=======
else if (cstr == "SPICE") c = new SpiceFile();
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else if (cstr == "Rus") c = new Resistor (false); // backward compatible
else if (cstr.left (6) == "SPfile" && cstr != "SPfile") {
// backward compatible

12
qucs/components/components.h
View File

@ -56,10 +56,7 @@
#include "vcvs.h"
#include "ccvs.h"
#include "tline.h"
<<<<<<< HEAD
=======
#include "ctline.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#include "tline_4port.h"
#include "twistedpair.h"
#include "coaxialline.h"
@ -91,10 +88,7 @@
#include "mosfet.h"
#include "mosfet_sub.h"
#include "eqndefined.h"
<<<<<<< HEAD
=======
#include "tunneldiode.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#include "dc_sim.h"
#include "ac_sim.h"
#include "tr_sim.h"
@ -118,10 +112,7 @@
#include "mutual.h"
#include "mutual2.h"
#include "coupler.h"
<<<<<<< HEAD
=======
#include "hybrid.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#include "switch.h"
#include "relais.h"
#include "am_modulator.h"
@ -158,10 +149,7 @@
#include "EKV26MOS.h"
#include "hicumL0V1p2.h"
#include "hicumL0V1p2g.h"
<<<<<<< HEAD
=======
#include "hicumL0V1p3.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#include "hicumL2V2p23.h"
#include "hicumL2V2p24.h"
#include "photodiode.h"

8
qucs/components/libcomponents.ap
View File

@ -1,11 +1,7 @@
#
# qucs/components/libcomponents.ap - Autodsp input file.
#
<<<<<<< HEAD
# Copyright (C) 2005-2010 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2005-2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -58,11 +54,7 @@ SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \
pad2bit.cpp pad3bit.cpp pad4bit.cpp binarytogrey4bit.cpp vafile.cpp \
greytobinary4bit.cpp comp_1bit.cpp comp_2bit.cpp comp_4bit.cpp \
hpribin4bit.cpp msrstub.cpp phototransistor.cpp nigbt.cpp hicumL2V2p24.cpp \
<<<<<<< HEAD
hicumL0V1p2g.cpp
=======
hicumL0V1p2g.cpp hybrid.cpp ctline.cpp tunneldiode.cpp hicumL0V1p3.cpp
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
# List of special Qt files.
MOCHEADERS = componentdialog.h spicedialog.h optimizedialog.h spicefile.h

4
qucs/components/mslange.cpp
View File

@ -20,11 +20,7 @@
MSlange::MSlange()
{
<<<<<<< HEAD
Description = QObject::tr("microchip lange coupler");
=======
Description = QObject::tr("microstrip lange coupler");
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Lines.append(new Line(-30,-30,-30, 10,QPen(QPen::darkBlue,2)));
Lines.append(new Line(-30, 30,-30, 20,QPen(QPen::darkBlue,2)));

16
qucs/diagrams/graph.cpp
View File

@ -159,20 +159,13 @@ int Graph::getSelected(int x, int y)
if(*pp <= BRANCHEND) z++;
pp++;
if(*pp <= BRANCHEND) {
<<<<<<< HEAD
=======
if(*pp <= GRAPHEND) return -1; // not even one point ?
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
z++;
pp++;
if(*pp < BRANCHEND) return -1; // not even one point ?
}
}
<<<<<<< HEAD
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(Style >= GRAPHSTYLE_STAR) {
// for graph symbols
while(*pp > GRAPHEND) {
@ -191,18 +184,9 @@ int Graph::getSelected(int x, int y)
pp++;
}
}
<<<<<<< HEAD
return -1;
}
=======
return -1;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// for graph lines
while(*pp > GRAPHEND) {
while(*pp >= STROKEEND) {

27
qucs/dialogs/settingsdialog.cpp
View File

@ -48,19 +48,6 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
// ...........................................................
QWidget *Tab1 = new QWidget(t);
<<<<<<< HEAD
QGridLayout *gp = new QGridLayout(Tab1,4,2,5,5);
QLabel *l1 = new QLabel(tr("Data Display:"), Tab1);
gp->addWidget(l1,0,0);
Input_DataDisplay = new QLineEdit(Tab1);
gp->addWidget(Input_DataDisplay,0,1);
QLabel *l2 = new QLabel(tr("Data Set:"), Tab1);
gp->addWidget(l2,1,0);
Input_DataSet = new QLineEdit(Tab1);
gp->addWidget(Input_DataSet,1,1);
=======
QGridLayout *gp = new QGridLayout(Tab1,6,2,5,5);
QLabel *l1 = new QLabel(tr("Data Display:"), Tab1);
@ -72,14 +59,11 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
gp->addWidget(l2,0,0);
Input_DataSet = new QLineEdit(Tab1);
gp->addWidget(Input_DataSet,0,1);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Check_OpenDpl = new QCheckBox(tr("open data display after simulation"),
Tab1);
gp->addMultiCellWidget(Check_OpenDpl,2,2,0,1);
<<<<<<< HEAD
=======
QLabel *l20 = new QLabel(tr("Octave Script:"), Tab1);
gp->addWidget(l20,3,0);
Input_Script = new QLineEdit(Tab1);
@ -89,7 +73,6 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
Tab1);
gp->addMultiCellWidget(Check_RunScript,4,4,0,1);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
t->addTab(Tab1, tr("Simulation"));
// ...........................................................
@ -165,13 +148,9 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
Input_DataSet->setText(Doc->DataSet);
Input_DataDisplay->setText(Doc->DataDisplay);
<<<<<<< HEAD
Check_OpenDpl->setChecked(Doc->SimOpenDpl);
=======
Input_Script->setText(Doc->Script);
Check_OpenDpl->setChecked(Doc->SimOpenDpl);
Check_RunScript->setChecked(Doc->SimRunScript);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Check_GridOn->setChecked(Doc->GridOn);
Input_GridX->setText(QString::number(Doc->GridX));
Input_GridY->setText(QString::number(Doc->GridY));
@ -218,27 +197,21 @@ void SettingsDialog::slotApply()
changed = true;
}
<<<<<<< HEAD
=======
if(Doc->Script != Input_Script->text()) {
Doc->Script = Input_Script->text();
changed = true;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(Doc->SimOpenDpl != Check_OpenDpl->isChecked()) {
Doc->SimOpenDpl = Check_OpenDpl->isChecked();
changed = true;
}
<<<<<<< HEAD
=======
if(Doc->SimRunScript != Check_RunScript->isChecked()) {
Doc->SimRunScript = Check_RunScript->isChecked();
changed = true;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(Doc->GridOn != Check_GridOn->isChecked()) {
Doc->GridOn = Check_GridOn->isChecked();
changed = true;

6
qucs/dialogs/settingsdialog.h
View File

@ -45,15 +45,9 @@ public:
QComboBox *Combo_Frame;
QTextEdit *Input_Frame0;
QLineEdit *Input_Frame1, *Input_Frame2, *Input_Frame3;
<<<<<<< HEAD
QLineEdit *Input_DataSet, *Input_DataDisplay;
QLineEdit *Input_GridX, *Input_GridY;
QCheckBox *Check_OpenDpl, *Check_GridOn;
=======
QLineEdit *Input_DataSet, *Input_DataDisplay, *Input_Script;
QLineEdit *Input_GridX, *Input_GridY;
QCheckBox *Check_OpenDpl, *Check_GridOn, *Check_RunScript;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QVBoxLayout *all;
QRegExpValidator *valExpr;

12
qucs/dialogs/simmessage.cpp
View File

@ -51,19 +51,13 @@ SimMessage::SimMessage(QWidget *w, QWidget *parent)
DocName = Doc->DocName;
DataDisplay = Doc->DataDisplay;
<<<<<<< HEAD
=======
Script = Doc->Script;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QFileInfo Info(DocName);
DataSet = QDir::convertSeparators(Info.dirPath()) +
QDir::separator() + Doc->DataSet;
showBias = Doc->showBias; // save some settings as the document...
SimOpenDpl = Doc->SimOpenDpl; // ...could be closed during the simulation.
<<<<<<< HEAD
=======
SimRunScript = Doc->SimRunScript;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
all = new QVBoxLayout(this);
all->setSpacing(5);
@ -378,14 +372,10 @@ void SimMessage::startSimulator()
for(QStringList::Iterator it = Collect.begin();
it != Collect.end(); ++it) {
// don't put library includes into netlist...
<<<<<<< HEAD
if ((*it).right(4) != ".lst") {
=======
if ((*it).right(4) != ".lst" &&
(*it).right(5) != ".vhdl" &&
(*it).right(4) != ".vhd" &&
(*it).right(2) != ".v") {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Stream << *it << '\n';
}
}
@ -393,7 +383,7 @@ void SimMessage::startSimulator()
isVerilog = ((Schematic*)DocWidget)->isVerilog;
SimTime = ((Schematic*)DocWidget)->createNetlist(Stream, SimPorts);
if(SimTime.at(0) == '§') {
if(SimTime.at(0) == '\A7') {
NetlistFile.close();
ErrText->insert(SimTime.mid(1));
FinishSimulation(-1);

4
qucs/dialogs/simmessage.h
View File

@ -77,12 +77,8 @@ public:
QWidget *DocWidget;
int showBias;
bool SimOpenDpl;
<<<<<<< HEAD
QString DocName, DataSet, DataDisplay;
=======
bool SimRunScript;
QString DocName, DataSet, DataDisplay, Script;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QProcess SimProcess;
QTextEdit *ProgText, *ErrText;

6
qucs/main.cpp
View File

@ -560,20 +560,14 @@ int main(int argc, char *argv[])
QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/");
QucsSettings.LibDir =
QDir::convertSeparators (QucsDirStr + "/share/qucs/library/");
<<<<<<< HEAD
=======
QucsSettings.OctaveDir =
QDir::convertSeparators (QucsDirStr + "/share/qucs/octave/");
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
} else {
QucsSettings.BinDir = BINARYDIR;
QucsSettings.BitmapDir = BITMAPDIR;
QucsSettings.LangDir = LANGUAGEDIR;
QucsSettings.LibDir = LIBRARYDIR;
<<<<<<< HEAD
=======
QucsSettings.OctaveDir = OCTAVEDIR;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
QucsSettings.Editor = QucsSettings.BinDir + "qucsedit";

3
qucs/main.h
View File

@ -54,10 +54,7 @@ struct tQucsSettings {
QString LangDir;
QString LibDir;
QString AscoDir;
<<<<<<< HEAD
=======
QString OctaveDir;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
unsigned int NodeWiring;

12
qucs/module.cpp
View File

@ -184,10 +184,7 @@ void Module::registerModules (void) {
REGISTER_LUMPED_1 (Gyrator);
REGISTER_LUMPED_1 (Phaseshifter);
REGISTER_LUMPED_1 (Coupler);
<<<<<<< HEAD
=======
REGISTER_LUMPED_1 (Hybrid);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REGISTER_LUMPED_1 (iProbe);
REGISTER_LUMPED_1 (vProbe);
REGISTER_LUMPED_1 (Mutual);
@ -230,10 +227,7 @@ void Module::registerModules (void) {
// transmission lines
REGISTER_TRANS_1 (TLine);
REGISTER_TRANS_1 (TLine_4Port);
<<<<<<< HEAD
=======
REGISTER_TRANS_1 (CoupledTLine);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REGISTER_TRANS_1 (TwistedPair);
REGISTER_TRANS_1 (CoaxialLine);
REGISTER_TRANS_1 (RectLine);
@ -270,10 +264,7 @@ void Module::registerModules (void) {
REGISTER_NONLINEAR_1 (Diac);
REGISTER_NONLINEAR_1 (Triac);
REGISTER_NONLINEAR_1 (Thyristor);
<<<<<<< HEAD
=======
REGISTER_NONLINEAR_1 (TunnelDiode);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// verilog-a devices
REGISTER_VERILOGA_1 (hicumL2V2p1);
@ -287,10 +278,7 @@ void Module::registerModules (void) {
REGISTER_VERILOGA_2 (EKV26MOS, info, info_pmos);
REGISTER_VERILOGA_2 (hicumL0V1p2, info, info_pnp);
REGISTER_VERILOGA_2 (hicumL0V1p2g, info, info_pnp);
<<<<<<< HEAD
=======
REGISTER_VERILOGA_2 (hicumL0V1p3, info, info_pnp);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REGISTER_VERILOGA_1 (hicumL2V2p23);
REGISTER_VERILOGA_1 (hicumL2V2p24);
REGISTER_VERILOGA_1 (photodiode);

4
qucs/paintings/graphictext.cpp
View File

@ -189,11 +189,7 @@ QString GraphicText::saveCpp()
QString ("new Text (%1, %2, \"%3\", QColor (\"%4\"), %5, %6, %7)").
arg(cx).arg(cy).arg(t).
arg(Color.name()).arg(Font.pointSize()).
<<<<<<< HEAD
arg(sin(M_PI * Angle / 180.0)).arg(cos(M_PI * Angle / 180.0));
=======
arg(cos(M_PI * Angle / 180.0)).arg(sin(M_PI * Angle / 180.0));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
s = "Texts.append (" + s + ");";
return s;
}

11
qucs/qucs.ap
View File

@ -1,11 +1,7 @@
#
# qucs/qucs.ap - Autodsp input file.
#
<<<<<<< HEAD
# Copyright (C) 2005, 2006, 2009 Stefan Jahn <stefan@lkcc.org>
=======
# Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -31,17 +27,10 @@ NAME = qucs
SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \
qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \
viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \
<<<<<<< HEAD
schematic_file.cpp syntax.cpp module.cpp
# List of special Qt files.
MOCHEADERS = qucs.h schematic.h textdoc.h
=======
schematic_file.cpp syntax.cpp module.cpp octave_window.cpp
# List of special Qt files.
MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
# Additional libraries.
LIBS = -lcomponents -ldiagrams -lpaintings -ldialogs \

83
qucs/qucs.cpp
View File

@ -83,10 +83,7 @@
#include "dialogs/simmessage.h"
#include "dialogs/vtabwidget.h"
#include "dialogs/vtabbeddockwidget.h"
<<<<<<< HEAD
=======
#include "octave_window.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
extern const char *empty_xpm[];
@ -133,10 +130,7 @@ QucsApp::QucsApp()
tr("VHDL Sources")+" (*.vhdl *.vhd);;"+
tr("Verilog Sources")+" (*.v);;"+
tr("Verilog-A Sources")+" (*.va);;"+
<<<<<<< HEAD
=======
tr("Octave Scripts")+" (*.m *.oct);;"+
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
tr("Any File")+" (*)";
QucsWorkDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
QucsHomeDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
@ -144,14 +138,11 @@ QucsApp::QucsApp()
move (QucsSettings.x, QucsSettings.y);
resize(QucsSettings.dx, QucsSettings.dy);
<<<<<<< HEAD
=======
MouseMoveAction = 0;
MousePressAction = 0;
MouseReleaseAction = 0;
MouseDoubleClickAction = 0;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
initView();
initActions();
initMenuBar();
@ -160,10 +151,7 @@ QucsApp::QucsApp()
viewToolBar->setOn(true);
viewStatusBar->setOn(true);
viewBrowseDock->setOn(true);
<<<<<<< HEAD
=======
slotViewOctaveDock(false);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
initCursorMenu();
HierarchyHistory.setAutoDelete(true);
Module::registerModules ();
@ -191,11 +179,6 @@ QucsApp::QucsApp()
QString arg = qApp->argv()[z];
if(*(arg) != '-') {
// allow uri's: file:/home/linuxuser/Desktop/example.sch
<<<<<<< HEAD
QString f = QDir::convertSeparators(QUriDrag::uriToLocalFile(arg));
if(f.isEmpty()) f = arg;
gotoPage(f);
=======
if(arg.contains(":/")) {
QString f = QDir::convertSeparators(QUriDrag::uriToLocalFile(arg));
if(f.isEmpty()) f = arg;
@ -203,7 +186,6 @@ QucsApp::QucsApp()
} else {
gotoPage(arg);
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
}
}
@ -226,10 +208,7 @@ void QucsApp::initContentListView()
ConOthers = new QListViewItem(Content, tr("Others"));
ConDatasets = new QListViewItem(Content, tr("Datasets"));
ConDisplays = new QListViewItem(Content, tr("Data Displays"));
<<<<<<< HEAD
=======
ConOctave = new QListViewItem(Content, tr("Octave"));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
ConVerilog = new QListViewItem(Content, tr("Verilog"));
ConVerilogA = new QListViewItem(Content, tr("Verilog-A"));
ConSources = new QListViewItem(Content, tr("VHDL"));
@ -322,8 +301,6 @@ void QucsApp::initView()
moveDockWindow(dock,DockLeft);
TabView->setCurrentPage(0);
<<<<<<< HEAD
=======
// ----------------------------------------------------------
// Octave docking window
octDock = new QDockWindow(QDockWindow::InDock, this);
@ -332,7 +309,6 @@ void QucsApp::initView()
octave = new OctaveWindow(octDock);
moveDockWindow(octDock, Qt::DockBottom);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// ............................................
readProjects(); // reads all projects and inserts them into the ListBox
}
@ -796,11 +772,8 @@ void QucsApp::readProjectFiles()
delete ConVerilogA->firstChild();
while(ConOthers->firstChild())
delete ConOthers->firstChild();
<<<<<<< HEAD
=======
while(ConOctave->firstChild())
delete ConOctave->firstChild();
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
int n;
// put all files into "Content"-ListView
@ -828,11 +801,8 @@ void QucsApp::readProjectFiles()
new QListViewItem(ConVerilog, (*it).ascii());
else if(Str == "va")
new QListViewItem(ConVerilogA, (*it).ascii());
<<<<<<< HEAD
=======
else if((Str == "m") || (Str == "oct"))
new QListViewItem(ConOctave, (*it).ascii());
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else
new QListViewItem(ConOthers, (*it).ascii());
}
@ -857,10 +827,7 @@ void QucsApp::openProject(const QString& Path, const QString& Name)
return;
}
QucsWorkDir.setPath(ProjDir.path());
<<<<<<< HEAD
=======
octave->adjustDirectory();
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Content->setColumnText(0,tr("Content of '")+Name+tr("'")); // column text
ConSchematics->setOpen(false); // get sure to have it closed
@ -925,10 +892,7 @@ void QucsApp::slotMenuCloseProject()
slotResetWarnings();
setCaption("Qucs " PACKAGE_VERSION + tr(" - Project: "));
QucsWorkDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
<<<<<<< HEAD
=======
octave->adjustDirectory();
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Content->setColumnText(0,tr("Content of")); // column text
initContentListView();
@ -1183,21 +1147,14 @@ bool QucsApp::saveAs()
}
// list of known file extensions
<<<<<<< HEAD
QString ext = "vhdl;vhd;v;va;sch;dpl";
=======
QString ext = "vhdl;vhd;v;va;sch;dpl;m;oct";
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QStringList extlist = QStringList::split (';', ext);
if(isTextDocument (w))
Filter = tr("VHDL Sources")+" (*.vhdl *.vhd);;" +
tr("Verilog Sources")+" (*.v);;"+
tr("Verilog-A Sources")+" (*.va);;"+
<<<<<<< HEAD
=======
tr("Octave Scripts")+" (*.m *.oct);;"+
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
tr("Any File")+" (*)";
else
Filter = QucsFileFilter;
@ -1255,11 +1212,8 @@ bool QucsApp::saveAs()
Content->setSelected(new QListViewItem(ConVerilog, s), true);
else if(ext == "va")
Content->setSelected(new QListViewItem(ConVerilogA, s), true);
<<<<<<< HEAD
=======
else if(ext == "m" || ext == "oct")
Content->setSelected(new QListViewItem(ConOctave, s), true);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else
Content->setSelected(new QListViewItem(ConOthers, s), true);
}
@ -1428,17 +1382,12 @@ void QucsApp::slotFileSettings ()
QWidget * w = DocumentTab->currentPage ();
if (isTextDocument (w)) {
QucsDoc * Doc = (QucsDoc *) ((TextDoc *) w);
<<<<<<< HEAD
// Verilog-A properties
if (Doc->fileSuffix () == "va") {
=======
QString ext = Doc->fileSuffix ();
// Octave properties
if (ext == "m" || ext == "oct") {
}
// Verilog-A properties
else if (ext == "va") {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
VASettingsDialog * d = new VASettingsDialog ((TextDoc *) w);
d->exec ();
}
@ -1743,13 +1692,8 @@ void QucsApp::slotSimulate()
if(!saveAs()) return; // ... save schematic before
// Perhaps the document was modified from another program ?
<<<<<<< HEAD
if(Doc->lastSaved.isValid()) {
QFileInfo Info(Doc->DocName);
=======
QFileInfo Info(Doc->DocName);
if(Doc->lastSaved.isValid()) {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(Doc->lastSaved < Info.lastModified()) {
int No = QMessageBox::warning(this, tr("Warning"),
tr("The document was modified by another program !") + '\n' +
@ -1761,8 +1705,6 @@ void QucsApp::slotSimulate()
}
slotResetWarnings();
<<<<<<< HEAD
=======
if(Info.extension(false) == "m" || Info.extension(false) == "oct") {
// It is an Octave script.
@ -1773,7 +1715,6 @@ void QucsApp::slotSimulate()
return;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
SimMessage *sim = new SimMessage(w, this);
// disconnect is automatically performed, if one of the involved objects
// is destroyed !
@ -1811,17 +1752,6 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim)
Dia->show();
}
}
<<<<<<< HEAD
else if(sim->SimOpenDpl) {
// switch to data display
slotChangePage(sim->DocName, sim->DataDisplay);
sim->slotClose(); // close and delete simulation window
}
else
if(w) if(!isTextDocument (sim->DocWidget))
// load recent simulation data (if document is still open)
((Schematic*)sim->DocWidget)->reloadGraphs();
=======
else {
if(sim->SimRunScript) {
// run script
@ -1844,7 +1774,6 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim)
// load recent simulation data (if document is still open)
((Schematic*)sim->DocWidget)->reloadGraphs();
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(!isTextDocument (sim->DocWidget))
((Schematic*)sim->DocWidget)->viewport()->update();
@ -1880,12 +1809,8 @@ void QucsApp::slotChangePage(QString& DocName, QString& DataDisplay)
DocumentTab->setCurrentPage(z);
else { // no open page found ?
QString ext = QucsDoc::fileSuffix (DataDisplay);
<<<<<<< HEAD
if (ext != "vhd" && ext != "vhdl" && ext != "v" && ext != "va")
=======
if (ext != "vhd" && ext != "vhdl" && ext != "v" && ext != "va" &&
ext != "oct" && ext != "m")
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
d = new Schematic (this, Name);
else
d = new TextDoc (this, Name);
@ -1937,15 +1862,11 @@ void QucsApp::slotToPage()
return;
}
<<<<<<< HEAD
slotChangePage(d->DocName, d->DataDisplay);
=======
if(d->DocName.right(2) == ".m" ||
d->DocName.right(4) == ".oct")
slotViewOctaveDock(true);
else
slotChangePage(d->DocName, d->DataDisplay);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
// -------------------------------------------------------------------
@ -1971,12 +1892,8 @@ void QucsApp::slotOpenContent(QListViewItem *item)
QString Suffix = Info.extension(false);
if (Suffix == "sch" || Suffix == "dpl" || Suffix == "vhdl" ||
<<<<<<< HEAD
Suffix == "v" || Suffix == "va") {
=======
Suffix == "vhd" || Suffix == "v" || Suffix == "va" ||
Suffix == "m" || Suffix == "oct") {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
gotoPage(Info.absFilePath());
if(item->text(1).isEmpty()) // is subcircuit ?

17
qucs/qucs.h
View File

@ -43,10 +43,7 @@ class QIconView;
class QIconViewItem;
class VTabbedDockWidget;
class VTabWidget;
<<<<<<< HEAD
=======
class OctaveWindow;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
typedef bool (Schematic::*pToggleFunc) ();
typedef void (MouseActions::*pMouseFunc) (Schematic*, QMouseEvent*);
@ -166,20 +163,13 @@ private:
// ********* Widgets on the main area **********************************
VTabbedDockWidget *dock;
VTabWidget *TabView;
<<<<<<< HEAD
=======
QDockWindow *octDock;
OctaveWindow *octave;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QListBox *Projects;
QListView *Content;
QListViewItem *ConSchematics, *ConSources, *ConDisplays, *ConDatasets,
<<<<<<< HEAD
*ConOthers, *ConVerilog, *ConVerilogA;
=======
*ConOthers, *ConVerilog, *ConVerilogA, *ConOctave;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QComboBox *CompChoose;
@ -222,11 +212,8 @@ private slots:
void slotViewToolBar(bool toggle); // toggle the toolbar
void slotViewStatusBar(bool toggle); // toggle the statusbar
void slotViewBrowseDock(bool toggle); // toggle the dock window
<<<<<<< HEAD
=======
void slotViewOctaveDock(bool); // toggle the dock window
void slotToggleOctave(bool);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
void slotToggleDock(bool);
void slotHelpAbout(); // shows an about dialog
void slotHelpAboutQt(); // shows the standard about dialog for Qt
@ -238,11 +225,7 @@ private:
void initStatusBar(); // setup the statusbar
QAction *helpAboutApp, *helpAboutQt, *viewToolBar, *viewStatusBar,
<<<<<<< HEAD
*viewBrowseDock;
=======
*viewBrowseDock, *viewOctaveDock;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// menus contain the items of their menubar
QPopupMenu *fileMenu, *editMenu, *insMenu, *projMenu, *simMenu, *viewMenu,

46
qucs/qucs_ar.ts
View File

@ -1391,8 +1391,6 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1400,7 +1398,6 @@ but is %1 !</source>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -6928,11 +6925,7 @@ qucsedit [-r] file :إستعمال
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">أجهزة فيريلوج v2.23 0 HICUM {1.3?}</translation>
=======
<translation type="unfinished">أجهزة فيريلوج v2.23 0 HICUM {1.3?}</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -6956,19 +6949,11 @@ qucsedit [-r] file :إستعمال
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -6999,9 +6984,6 @@ qucsedit [-r] file :إستعمال
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7131,7 +7113,6 @@ qucsedit [-r] file :إستعمال
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8543,13 +8524,13 @@ Selects all diagram markers of the document</source>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>دوران العنصر المختار ب° 90</translation>
<translation type="obsolete">دوران العنصر المختار ب° 90</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>
<translation type="obsolete">
دوران العنصر المختار ب° 90</translation>
</message>
@ -9269,8 +9250,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9293,7 +9272,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -10692,8 +10680,6 @@ are included in the search.</source>
<source>Cancel</source>
<translation>إلغاء</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -10702,7 +10688,6 @@ are included in the search.</source>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -10979,17 +10964,11 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -11004,7 +10983,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

34
qucs/qucs_ca.ts
View File

@ -1527,8 +1527,6 @@ pero es %1!</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1536,7 +1534,6 @@ pero es %1!</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7219,9 +7216,6 @@ Use: qucsedit [-r] fitxer
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7363,7 +7357,6 @@ Use: qucsedit [-r] fitxer
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8783,13 +8776,13 @@ Selecciona todos els elementos del document</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Rota el elemento seleccionado 90º</translation>
<translation type="obsolete">Rota el elemento seleccionado 90º</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Rotar
<translation type="obsolete">Rotar
Rota el elemento seleccionado 90º en el sentido de les agujas del reloj</translation>
</message>
@ -9939,8 +9932,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9963,7 +9954,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12745,8 +12745,6 @@ en la búsqueda.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -12755,7 +12753,6 @@ en la búsqueda.</translation>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13118,17 +13115,11 @@ Inserta esqueleto de la entidad VHDL</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -13143,7 +13134,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

34
qucs/qucs_cs.ts
View File

@ -1626,8 +1626,6 @@ je ale %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1635,7 +1633,6 @@ je ale %1 !</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7441,9 +7438,6 @@ Použití: qucsedit [-r] soubor
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7585,7 +7579,6 @@ Použití: qucsedit [-r] soubor
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9166,13 +9159,13 @@ Vybere všechny objekty v dokumentu</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Otočí vybrané komponenty o 90°</translation>
<translation type="obsolete">Otočí vybrané komponenty o 90°</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Otočit
<translation type="obsolete">Otočit
Otočí vybrané komponenty o 90° doleva</translation>
</message>
@ -10350,8 +10343,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -10374,7 +10365,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -14842,8 +14842,6 @@ jméně je hledaný řetězec. Do hledání budou zahrnuty všechny knihovny.</t
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -14852,7 +14850,6 @@ jméně je hledaný řetězec. Do hledání budou zahrnuty všechny knihovny.</t
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -15229,17 +15226,11 @@ Vloží konstrukci VHDL entity</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -15254,7 +15245,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

9323
qucs/qucs_de.ts
View File

File diff suppressed because it is too large Load Diff

46
qucs/qucs_es.ts
View File

@ -1528,8 +1528,6 @@ pero es %1!</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1537,7 +1535,6 @@ pero es %1!</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7196,11 +7193,7 @@ Use: qucsedit [-r] archivo
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">Componente verilog HICUM Level 0 v1.3</translation>
=======
<translation type="unfinished">Componente verilog HICUM Level 0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7224,19 +7217,11 @@ Use: qucsedit [-r] archivo
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7267,9 +7252,6 @@ Use: qucsedit [-r] archivo
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7399,7 +7381,6 @@ Use: qucsedit [-r] archivo
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8819,13 +8800,13 @@ Selecciona todos los elementos del documento</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Rota el elemento seleccionado 90º</translation>
<translation type="obsolete">Rota el elemento seleccionado 90º</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Rotar
<translation type="obsolete">Rotar
Rota el elemento seleccionado 90º en el sentido de las agujas del reloj</translation>
</message>
@ -9991,8 +9972,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -10015,7 +9994,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12799,8 +12787,6 @@ en la búsqueda.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -12809,7 +12795,6 @@ en la búsqueda.</translation>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13174,17 +13159,11 @@ Inserta esqueleto de la entidad VHDL</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -13199,7 +13178,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

46
qucs/qucs_fr.ts
View File

@ -1522,8 +1522,6 @@ or elle vaut %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1531,7 +1529,6 @@ or elle vaut %1 !</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7200,11 +7197,7 @@ Invocation : qucsedit [-r] fichier
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">Composant Verilog Hicum niveau 0 v1.3</translation>
=======
<translation type="unfinished">Composant Verilog Hicum niveau 0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7228,19 +7221,11 @@ Invocation : qucsedit [-r] fichier
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">NPN Hicum L0 v 1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">PNP Hicum L0 v 1.3</translation>
=======
<translation type="unfinished">NPN Hicum L0 v 1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">PNP Hicum L0 v 1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7271,9 +7256,6 @@ Invocation : qucsedit [-r] fichier
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7403,7 +7385,6 @@ Invocation : qucsedit [-r] fichier
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8885,13 +8866,13 @@ Sélectionne tous les éléments de la page</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Fait pivoter le composant sélectionné de 90°</translation>
<translation type="obsolete">Fait pivoter le composant sélectionné de 90°</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Pivoter
<translation type="obsolete">Pivoter
Tourne le composant sélectionné de 90° dans le sens direct</translation>
</message>
@ -10051,8 +10032,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -10075,7 +10054,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -13014,8 +13002,6 @@ le nom inclut le texte recherchée. La recherche est
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -13024,7 +13010,6 @@ le nom inclut le texte recherchée. La recherche est
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13384,17 +13369,11 @@ Insère un prototype d&apos;entité VHDL</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -13409,7 +13388,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

34
qucs/qucs_he.ts
View File

@ -1473,8 +1473,6 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1482,7 +1480,6 @@ but is %1 !</source>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7074,9 +7071,6 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7218,7 +7212,6 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8578,13 +8571,13 @@ Selects all elements of the document</source>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation type="unfinished">מסובב את הרכיב הנבחר ב90 מעלות</translation>
<translation type="obsolete">מסובב את הרכיב הנבחר ב90 מעלות</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation type="unfinished">סובב
<translation type="obsolete">סובב
מסובב את האלמנט הנבחר ב90 מעלות</translation>
</message>
@ -9660,8 +9653,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9684,7 +9675,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12273,8 +12273,6 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -12283,7 +12281,6 @@ are included in the search.</source>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12624,17 +12621,11 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -12649,7 +12640,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

34
qucs/qucs_hu.ts
View File

@ -1536,8 +1536,6 @@ de %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1545,7 +1543,6 @@ de %1 !</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7217,9 +7214,6 @@ Digitális szimuláció</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7361,7 +7355,6 @@ Digitális szimuláció</translation>
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8853,13 +8846,13 @@ Kijelöl minden elemet a dokumnetumban</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Elforgatja a kiválasztott komponenst 90°-kal</translation>
<translation type="obsolete">Elforgatja a kiválasztott komponenst 90°-kal</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Forgatás
<translation type="obsolete">Forgatás
Elforgatja a kiválasztott komponenst 90°-kal jobbra</translation>
</message>
@ -10029,8 +10022,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -10053,7 +10044,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12911,8 +12911,6 @@ Rács megjelenítése</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -12921,7 +12919,6 @@ Rács megjelenítése</translation>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13288,17 +13285,11 @@ Váz illesztés a VHDL entitáshoz</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -13313,7 +13304,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

17
qucs/qucs_init.cpp
View File

@ -32,10 +32,8 @@
#include "main.h"
#include "qucs.h"
#include "dialogs/vtabbeddockwidget.h"
<<<<<<< HEAD
=======
#include "octave_window.h"
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// ----------------------------------------------------------
// initializes all QActions of the application
@ -410,9 +408,9 @@ void QucsApp::initActions()
editRotate = new QAction(tr("Rotate"),
QIconSet(QImage(QucsSettings.BitmapDir + "rotate_ccw.png")),
tr("Rotate"), CTRL+Key_R, this);
editRotate->setStatusTip(tr("Rotates the selected component by 90°"));
editRotate->setStatusTip(tr("Rotates the selected component by 90\B0"));
editRotate->setWhatsThis(
tr("Rotate\n\nRotates the selected component by 90° counter-clockwise"));
tr("Rotate\n\nRotates the selected component by 90\B0 counter-clockwise"));
editRotate->setToggleAction(true);
connect(editRotate, SIGNAL(toggled(bool)), SLOT(slotEditRotate(bool)));
@ -613,8 +611,6 @@ void QucsApp::initActions()
tr("Browse Window\n\nEnables/disables the browse dock window"));
connect(viewBrowseDock, SIGNAL(toggled(bool)), SLOT(slotViewBrowseDock(bool)));
<<<<<<< HEAD
=======
viewOctaveDock = new QAction(tr("&Octave Window"), 0, this, 0);
viewOctaveDock->setToggleAction(true);
viewOctaveDock->setStatusTip(tr("Shows/hides the Octave dock window"));
@ -622,7 +618,6 @@ void QucsApp::initActions()
tr("Octave Window\n\nShows/hides the Octave dock window"));
connect(viewOctaveDock, SIGNAL(toggled(bool)), SLOT(slotViewOctaveDock(bool)));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
helpIndex = new QAction("Help Index...", tr("Help Index..."), Key_F1, this);
helpIndex->setStatusTip(tr("Index of Qucs Help"));
helpIndex->setWhatsThis(tr("Help Index\n\nIndex of intern Qucs help"));
@ -754,10 +749,7 @@ void QucsApp::initMenuBar()
viewToolBar->addTo(viewMenu);
viewStatusBar->addTo(viewMenu);
viewBrowseDock->addTo(viewMenu);
<<<<<<< HEAD
=======
viewOctaveDock->addTo(viewMenu);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
helpMenu = new QPopupMenu(); // menuBar entry helpMenu
helpIndex->addTo(helpMenu);
@ -928,8 +920,6 @@ void QucsApp::slotToggleDock(bool on)
}
// ----------------------------------------------------------
<<<<<<< HEAD
=======
// turn Octave Dock Window on or off
void QucsApp::slotViewOctaveDock(bool toggle)
{
@ -950,7 +940,6 @@ void QucsApp::slotToggleOctave(bool on)
}
// ----------------------------------------------------------
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
void QucsApp::slotHelpAbout()
{
QMessageBox::about(this, tr("About..."),

38
qucs/qucs_it.ts
View File

@ -1651,8 +1651,6 @@ ma è %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1660,7 +1658,6 @@ ma è %1 !</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7345,11 +7342,7 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">Dispositivo verilog HICUM Level 0 v1.3</translation>
=======
<translation type="unfinished">Dispositivo verilog HICUM Level 0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7400,9 +7393,6 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7540,7 +7530,6 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8093,13 +8082,13 @@ Seleziona tutti gli elementi del documento</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Ruota il componente selezionato di 90°</translation>
<translation type="obsolete">Ruota il componente selezionato di 90°</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Ruota
<translation type="obsolete">Ruota
Ruota il componente selezionato di 90° in senso antiorario</translation>
</message>
@ -10401,8 +10390,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -10425,7 +10412,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -13374,8 +13370,6 @@ sono incluse nella ricerca.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -13384,7 +13378,6 @@ sono incluse nella ricerca.</translation>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13747,17 +13740,11 @@ Inserisce scheletro entità VHDL</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -13772,7 +13759,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

34
qucs/qucs_jp.ts
View File

@ -1518,8 +1518,6 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1527,7 +1525,6 @@ but is %1 !</source>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7173,9 +7170,6 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7317,7 +7311,6 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8713,13 +8706,13 @@ Selects all elements of the document</source>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>選択された部品を90°回転</translation>
<translation type="obsolete">選択された部品を90°回転</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>回転
<translation type="obsolete">回転
選択された部品を時計周りに90°回転</translation>
</message>
@ -9882,8 +9875,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9906,7 +9897,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12623,8 +12623,6 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation>Letter 縦</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -12633,7 +12631,6 @@ are included in the search.</source>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -13000,17 +12997,11 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -13025,7 +13016,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

46
qucs/qucs_kk.ts
View File

@ -1370,8 +1370,6 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1379,7 +1377,6 @@ but is %1 !</source>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -6878,11 +6875,7 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">HICUM Level 0 v1.3 Verilog-моделі</translation>
=======
<translation type="unfinished">HICUM Level 0 v1.3 Verilog-моделі</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -6906,19 +6899,11 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn типті HICUM L0 1.3 нұсқасы {0?}</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp типті HICUM L0 1.3 нұсқасы {0?}</translation>
=======
<translation type="unfinished">npn типті HICUM L0 1.3 нұсқасы {0?}</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp типті HICUM L0 1.3 нұсқасы {0?}</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -6949,9 +6934,6 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7081,7 +7063,6 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8495,13 +8476,13 @@ Selects all diagram markers of the document</source>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Ерекшеленген компонентті сағат тіліне қарсы 90°-қа бұрады</translation>
<translation type="obsolete">Ерекшеленген компонентті сағат тіліне қарсы 90°-қа бұрады</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Бұру
<translation type="obsolete">Бұру
Ерекшеленген компонентті сағат тіліне қарсы 90°-қа бұрады</translation>
</message>
@ -9205,8 +9186,6 @@ Trolltech Qt жайлы</translation>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9229,7 +9208,16 @@ Trolltech Qt жайлы</translation>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -10619,8 +10607,6 @@ are included in the search.</source>
<source>Cancel</source>
<translation>Артқа қайтару</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -10629,7 +10615,6 @@ are included in the search.</source>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -10906,17 +10891,11 @@ VHDL объектісінің негізін қояды</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -10931,7 +10910,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

634
qucs/qucs_pl.ts
View File

@ -1525,8 +1525,6 @@ a jest %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1534,7 +1532,6 @@ a jest %1 !</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7232,11 +7229,7 @@ Stosowanie: qucsedit [-r] plik
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">komponent HICUM Level 0 v1.3 veriloga</translation>
=======
<translation type="unfinished">komponent HICUM Level 0 v1.3 veriloga</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7260,19 +7253,11 @@ Stosowanie: qucsedit [-r] plik
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7303,9 +7288,6 @@ Stosowanie: qucsedit [-r] plik
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7435,7 +7417,6 @@ Stosowanie: qucsedit [-r] plik
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8869,13 +8850,13 @@ Zaznacz wszystkie elementy w dokumencie</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Obraca wybrany elelement o 90 stopni</translation>
<translation type="obsolete">Obraca wybrany elelement o 90 stopni</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Obróć
<translation type="obsolete">Obróć
Obraca wybrany elelement o 90 stopni zgodnie z ruchem wskazówek zegara</translation>
</message>
@ -10034,8 +10015,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -10058,7 +10037,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12516,73 +12504,11 @@ otworzyć ten plik odpowiednim programem.</translation>
<source>power matching</source>
<translation type="obsolete">dopasowanie mocy</translation>
</message>
<<<<<<< HEAD
<message>
<source>Error</source>
<translation type="obsolete">Błąd</translation>
</message>
<message>
<source>noise matching</source>
<translation type="obsolete">dopasowanie szumowe</translation>
</message>
<message>
<source>2-port matching</source>
<translation type="obsolete">dopasowanie dwuwrotowe</translation>
</message>
<message>
<source>Could not load S[1,1].</source>
<translation type="obsolete">Nie można załadować S[1,1].</translation>
</message>
<message>
<source>Could not load S[1,2].</source>
<translation type="obsolete">Nie można załadować S[1,2].</translation>
</message>
<message>
<source>Could not load S[2,1].</source>
<translation type="obsolete">Nie można załadować S[2,1].</translation>
</message>
<message>
<source>Could not load S[2,2].</source>
<translation type="obsolete">Nie można załadować S[2,2].</translation>
</message>
<message>
<source>Wrong dependency!</source>
<translation type="obsolete">Zła zależność!</translation>
</message>
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SaveDialog</name>
<message>
<source>Modified Files</source>
<<<<<<< HEAD
<translation>Zmienione pliki</translation>
</message>
<message>
<source>Untitled</source>
<translation>Bez nazwy</translation>
</message>
<message>
<source>Save the modified files</source>
<translation>Zapisz zmodyfikowane pliki</translation>
</message>
<message>
<source>Select files to be saved</source>
<translation>Wybierz pliki, które mają być zapisane</translation>
</message>
<message>
<source>Abort Closing</source>
<translation>Przerwij zamykanie</translation>
</message>
<message>
<source>Save Selected</source>
<translation>Zapisz zaznaczone</translation>
</message>
<message>
<source>Don&apos;t Save</source>
<translation>Nie zapisuj</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
@ -12608,35 +12534,12 @@ otworzyć ten plik odpowiednim programem.</translation>
<message>
<source>Save Selected</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>Schematic</name>
<message>
<source>Title</source>
<<<<<<< HEAD
<translation>Tytuł</translation>
</message>
<message>
<source>Drawn By:</source>
<translation>Stworzona przez:</translation>
</message>
<message>
<source>Date:</source>
<translation>Data:</translation>
</message>
<message>
<source>Revision:</source>
<translation>Rewizja:</translation>
</message>
<message>
<source>ERROR: Cannot create library file &quot;%s&quot;.</source>
<translation>BŁĄD: Nie można utowrzyć biblioteki &quot;%s&quot;.</translation>
</message>
<message>
<source>generic</source>
=======
<translation type="unfinished"></translation>
</message>
<message>
@ -12649,7 +12552,6 @@ otworzyć ten plik odpowiednim programem.</translation>
</message>
<message>
<source>Revision:</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -12696,94 +12598,6 @@ Edytuj schemat</translation>
Edits the symbol for this schematic</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
</context>
<context>
<name>SearchDialog</name>
<message>
<source>The search result contains all components whose
name contains the search string. All libraries
are included in the search.</source>
<translation>Wyniki poszukiwań zawierają wszystkie elementy,
których nazwy zawiera szukany ciąg. W poszukiwaniach
uwzględniono wszystkie biblioteki.</translation>
</message>
<message>
<source>Search string:</source>
<translation>Szukany ciąg znaków:</translation>
</message>
<message>
<source>Search</source>
<translation>Szukaj</translation>
</message>
<message>
<source>Close</source>
<translation>Zamknij</translation>
</message>
<message>
<source>Search result</source>
<translation>Wyniki szukania</translation>
</message>
<message>
<source>Search Text</source>
<translation>Szukaj tekstu</translation>
</message>
<message>
<source>From cursor position</source>
<translation>Od pozycji kursora</translation>
</message>
<message>
<source>Case sensitive</source>
<translation>Rozróżniaj wielkość liter</translation>
</message>
<message>
<source>Whole words only</source>
<translation>Tylko całe wyrazy</translation>
</message>
<message>
<source>Search backwards</source>
<translation>Szukaj wstecz</translation>
</message>
<message>
<source>Cancel</source>
<translation>Porzuć</translation>
</message>
<message>
<source>Search...</source>
<translation>Szukaj...</translation>
</message>
<message>
<source>Text to search for</source>
<translation>Tekst do znalezienia</translation>
</message>
<message>
<source>Text to replace with</source>
<translation>Tekst do zamiany na</translation>
</message>
<message>
<source>Ask before replacing</source>
<translation>Spytaj przed zamianą</translation>
</message>
<message>
<source>Replace Text</source>
<translation>Zamień tekst</translation>
</message>
<message>
<source>Replace...</source>
<translation>Zamień...</translation>
</message>
<message>
<source>Replace occurrence ?</source>
<translation>Zamień wystąpienie ?</translation>
</message>
<message>
<source>Search string not found!</source>
<translation>Nie znaleziono szukanego ciąg znaków!</translation>
</message>
<message>
<source>Replaced %1 occurrences!</source>
<translation>Zamieniono %1 wystąpień!</translation>
=======
<message>
<source>generic</source>
<translation type="unfinished"></translation>
@ -12876,92 +12690,12 @@ are included in the search.</source>
<message>
<source>Search result</source>
<translation type="unfinished">Wyniki szukania</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>SettingsDialog</name>
<message>
<source>Edit File Properties</source>
<<<<<<< HEAD
<translation>Edytuj właściwości pliku</translation>
</message>
<message>
<source>Data Display:</source>
<translation>Prezentacja wyników:</translation>
</message>
<message>
<source>Data Set:</source>
<translation>Zbiór wyników:</translation>
</message>
<message>
<source>open data display after simulation</source>
<translation>otwórz prezentację wyników po symulacji</translation>
</message>
<message>
<source>Simulation</source>
<translation>Symulacja</translation>
</message>
<message>
<source>show Grid</source>
<translation>pokaż siatkę</translation>
</message>
<message>
<source>horizontal Grid:</source>
<translation>siatka pozioma:</translation>
</message>
<message>
<source>vertical Grid:</source>
<translation>siatka pionowa:</translation>
</message>
<message>
<source>Grid</source>
<translation>Siatka</translation>
</message>
<message>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
<source>Apply</source>
<translation>Zastosuj</translation>
</message>
<message>
<source>Cancel</source>
<translation>Porzuć</translation>
</message>
<message>
<source>Frame</source>
<translation>Ramka</translation>
</message>
<message>
<source>no Frame</source>
<translation>bez Ramki</translation>
</message>
<message>
<source>DIN A5 landscape</source>
<translation>DIN A5 poziomo</translation>
</message>
<message>
<source>DIN A5 portrait</source>
<translation>DIN A5 pionowo</translation>
</message>
<message>
<source>DIN A4 landscape</source>
<translation>DIN A4 poziomo</translation>
</message>
<message>
<source>DIN A4 portrait</source>
<translation>DIN A4 pionowo</translation>
</message>
<message>
<source>DIN A3 landscape</source>
<translation>DIN A3 poziomo</translation>
</message>
<message>
<source>DIN A3 portrait</source>
<translation>DIN A3 pionowo</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
@ -13031,7 +12765,6 @@ are included in the search.</source>
<message>
<source>DIN A3 portrait</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>Letter landscape</source>
@ -13041,8 +12774,6 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Frame</source>
<translation type="unfinished"></translation>
@ -13059,151 +12790,11 @@ are included in the search.</source>
<source>Cancel</source>
<translation type="unfinished">Porzuć</translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
<message>
<source>Qucs Simulation Messages</source>
<<<<<<< HEAD
<translation>Komunikaty z symulacji Qucs</translation>
</message>
<message>
<source>Progress:</source>
<translation>Postęp:</translation>
</message>
<message>
<source>Errors and Warnings:</source>
<translation>Błędy i ostrzeżenia:</translation>
</message>
<message>
<source>Goto display page</source>
<translation>Przejdź do strony wyników</translation>
</message>
<message>
<source>Abort simulation</source>
<translation>Przerwij symulację</translation>
</message>
<message>
<source>Starting new simulation on </source>
<translation type="obsolete">Rozpoczynanie nowej symulacji</translation>
</message>
<message>
<source> at </source>
<translation type="obsolete">o</translation>
</message>
<message>
<source>ERROR: Simulator is still running!</source>
<translation>BŁĄD: Symulacja ciągle w toku!</translation>
</message>
<message>
<source>creating netlist ....</source>
<translation type="obsolete">tworzenie netlisty ...</translation>
</message>
<message>
<source>ERROR: Cannot write netlist file!</source>
<translation>BŁĄD: Nie można zapisać netlisty!</translation>
</message>
<message>
<source>ERROR: Cannot start QucsConv!</source>
<translation>BŁĄD: Nie można uruchomić QucsConv!</translation>
</message>
<message>
<source>done.
</source>
<translation type="obsolete">zrobione.
</translation>
</message>
<message>
<source>ERROR: Cannot start simulator!</source>
<translation>BŁĄD: Nie mogę uruchomić symulatora!</translation>
</message>
<message>
<source>Close window</source>
<translation>Zamknij okno</translation>
</message>
<message>
<source>
Simulation ended on </source>
<translation type="obsolete">
Symulacja zakończona o</translation>
</message>
<message>
<source>Ready.
</source>
<translation type="obsolete">Gotowy.
</translation>
</message>
<message>
<source>
Errors occured during simulation on </source>
<translation type="obsolete">
Podczas symulacji wystąpiły błędy</translation>
</message>
<message>
<source>Aborted.
</source>
<translation type="obsolete">Przerwane.
</translation>
</message>
<message>
<source>Output:
----------
</source>
<translation type="obsolete">Wyjście:
----------
</translation>
</message>
<message>
<source>
Errors:
--------
</source>
<translation type="obsolete">
Błędy:
----------
</translation>
</message>
<message>
<source>creating netlist... </source>
<translation>tworzenie netlisty... </translation>
</message>
<message>
<source>ERROR: Cannot open SPICE file &quot;%1&quot;.</source>
<translation>BŁĄD: Nie można otworzyć pliku SPICE &quot;%1&quot;.</translation>
</message>
<message>
<source>Starting new simulation on %1 at %2</source>
<translation>Start nowej symulacji na %1 o %2</translation>
</message>
<message>
<source>done.</source>
<translation>gotowe.</translation>
</message>
<message>
<source>Simulation ended on %1 at %2</source>
<translation>Koniec symulacji na %1 o %2</translation>
</message>
<message>
<source>Ready.</source>
<translation>Gotowy.</translation>
</message>
<message>
<source>Errors occurred during simulation on %1 at %2</source>
<translation>Błędy podczas symulacji %1 o %2</translation>
</message>
<message>
<source>Aborted.</source>
<translation>Przerwano.</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
@ -13281,33 +12872,15 @@ Błędy:
<message>
<source>Aborted.</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>Output:
-------</source>
<<<<<<< HEAD
<translation>Wynik:
------</translation>
=======
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>Errors:
-------</source>
<<<<<<< HEAD
<translation>Błędy:
-------</translation>
</message>
<message>
<source>ERROR: Cannot create VHDL directory &quot;%1&quot;!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ERROR: Cannot create &quot;%1&quot;!</source>
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
</context>
@ -13315,117 +12888,6 @@ Błędy:
<name>SpiceDialog</name>
<message>
<source>Edit SPICE Component Properties</source>
<<<<<<< HEAD
<translation>Edytuj właściwości elementu SPICE</translation>
</message>
<message>
<source>Name:</source>
<translation>Nazwa:</translation>
</message>
<message>
<source>File:</source>
<translation>Plik: </translation>
</message>
<message>
<source>Browse</source>
<translation>Pokaż</translation>
</message>
<message>
<source>Edit</source>
<translation>Edytuj</translation>
</message>
<message>
<source>show file name in schematic</source>
<translation>pokaż nazwę pliku na schemacie</translation>
</message>
<message>
<source>include SPICE simulations</source>
<translation>dołącz symulację SPICE</translation>
</message>
<message>
<source>SPICE net nodes:</source>
<translation>węzły SPICE:</translation>
</message>
<message>
<source>Add &gt;&gt;</source>
<translation>Dodaj &gt;&gt;</translation>
</message>
<message>
<source>&lt;&lt; Remove</source>
<translation>&lt;&lt; Usuń</translation>
</message>
<message>
<source>Component ports:</source>
<translation>Porty elementów:</translation>
</message>
<message>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
<source>Apply</source>
<translation>Zastosuj</translation>
</message>
<message>
<source>Cancel</source>
<translation>Porzuć</translation>
</message>
<message>
<source>SPICE netlist</source>
<translation>netlista w formacie SPICE</translation>
</message>
<message>
<source>All Files</source>
<translation>Wszystkie pliki</translation>
</message>
<message>
<source>Select a file</source>
<translation>Wybierz plik</translation>
</message>
<message>
<source>Info</source>
<translation>Informacja</translation>
</message>
<message>
<source>Converting ...</source>
<translation type="obsolete">Konwersja ...</translation>
</message>
<message>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
<source>Cannot execute</source>
<translation type="obsolete">Nie można wykonać</translation>
</message>
<message>
<source>QucsConv Error</source>
<translation>Błąd QucsConv</translation>
</message>
<message>
<source>Converting SPICE file &quot;%1&quot;.</source>
<translation>Konwersja pliku SPICE &quot;%1&quot;.</translation>
</message>
<message>
<source>preprocessor</source>
<translation>preprocessor</translation>
</message>
<message>
<source>Preprocessing SPICE file &quot;%1&quot;.</source>
<translation>Preprocessing SPICE file &quot;%1&quot;.</translation>
</message>
<message>
<source>SPICE Preprocessor Error</source>
<translation>SPICE Preprocessor Error</translation>
</message>
<message>
<source>Cannot save preprocessed SPICE file &quot;%1&quot;.</source>
<translation>Nie można zapisać pliku SPICE &quot;%1&quot;.</translation>
</message>
<message>
<source>Cannot execute &quot;%1&quot;.</source>
<translation>Nie mozna wykonać &quot;%1&quot;.</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
@ -13527,65 +12989,33 @@ Błędy:
<message>
<source>QucsConv Error</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>SweepDialog</name>
<message>
<source>Bias Points</source>
<<<<<<< HEAD
<translation>Punkty pracy</translation>
</message>
<message>
<source>Close</source>
<translation>Zamknij</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Close</source>
<translation type="unfinished">Zamknij</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>SymbolWidget</name>
<message>
<source>Symbol:</source>
<<<<<<< HEAD
<translation>Symbol:</translation>
</message>
<message>
<source>! Drag n&apos;Drop me !</source>
<translation>!Przeciągnij mnie i upuść!</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>! Drag n&apos;Drop me !</source>
<translation type="unfinished"></translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
</context>
<context>
<name>TextDoc</name>
<message>
<<<<<<< HEAD
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
<source>There is no selection!</source>
<translation>Nic nie wybrano!</translation>
</message>
<message>
<source>Page %1 of %2</source>
<translation>Strona %1 z %2</translation>
</message>
<message>
=======
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<source>Edit Text Symbol</source>
<translation type="unfinished"></translation>
</message>
@ -13624,47 +13054,11 @@ wstawia szkielet VHDL entity</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
</context>
<context>
<name>VASettingsDialog</name>
<message>
<source>Document Settings</source>
<translation type="unfinished">Ustawienia dokumentu</translation>
</message>
<message>
<source>Simulation</source>
<translation type="obsolete">Symulacja</translation>
</message>
<message>
<source>Duration of Simulation:</source>
<translation type="obsolete">Czas trwania symulacji:</translation>
</message>
<message>
<source>Library Name:</source>
<translation type="obsolete">Nazwa biblioteki:</translation>
</message>
<message>
<source>Ok</source>
<translation type="unfinished">OK</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Porzuć</translation>
</message>
<message>
<source>Error</source>
<translation type="obsolete">Błąd</translation>
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -13697,7 +13091,6 @@ Inserts the skeleton of a Octave function</source>
<message>
<source>Document Settings</source>
<translation type="unfinished">Ustawienia dokumentu</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>Code Creation Settings</source>
@ -13748,8 +13141,6 @@ Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
=======
<source>Ok</source>
<translation type="unfinished">OK</translation>
</message>
@ -13758,7 +13149,6 @@ Inserts the skeleton of a Octave function</source>
<translation type="unfinished">Porzuć</translation>
</message>
<message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<source>PNG files</source>
<translation type="unfinished"></translation>
</message>

40
qucs/qucs_pt.ts
View File

@ -1458,8 +1458,6 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1467,7 +1465,6 @@ but is %1 !</source>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Name:</source>
@ -7085,9 +7082,6 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7229,7 +7223,6 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8362,16 +8355,6 @@ Selects all diagram markers of the document</source>
<source>Rotate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mirror about X Axis</source>
<translation type="unfinished"></translation>
@ -9162,8 +9145,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9186,7 +9167,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -10575,8 +10565,6 @@ are included in the search.</source>
<source>Cancel</source>
<translation type="unfinished">Cancelar</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -10585,7 +10573,6 @@ are included in the search.</source>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -10860,17 +10847,11 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -10885,7 +10866,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

34
qucs/qucs_ro.ts
View File

@ -1464,8 +1464,6 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1473,7 +1471,6 @@ but is %1 !</source>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7158,9 +7155,6 @@ Folosire: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7302,7 +7296,6 @@ Folosire: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8664,13 +8657,13 @@ Selectează toate elementele din document</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation type="unfinished">Roteşte componenta curentă cu 90°</translation>
<translation type="obsolete">Roteşte componenta curentă cu 90°</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation type="unfinished">Roteşte
<translation type="obsolete">Roteşte
Roteşte componenta selectată cu 90° sens antiorar</translation>
</message>
@ -9750,8 +9743,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9774,7 +9765,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12369,8 +12369,6 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -12379,7 +12377,6 @@ are included in the search.</source>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12728,17 +12725,11 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -12753,7 +12744,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

46
qucs/qucs_ru.ts
View File

@ -1633,8 +1633,6 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1642,7 +1640,6 @@ but is %1 !</source>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7441,11 +7438,7 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">HICUM Level 0 v1.3 Verilog-модель</translation>
=======
<translation type="unfinished">HICUM Level 0 v1.3 Verilog-модель</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7469,19 +7462,11 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7512,9 +7497,6 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7644,7 +7626,6 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -9263,13 +9244,13 @@ Selects all elements of the document</source>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Поворачивает выделенный компонент на 90°</translation>
<translation type="obsolete">Поворачивает выделенный компонент на 90°</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Повернуть
<translation type="obsolete">Повернуть
Поворачивает выделенный компонент на 90° против часовой стрелки</translation>
</message>
@ -10405,8 +10386,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -10429,7 +10408,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -14908,8 +14896,6 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation>Letter портрет</translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -14918,7 +14904,6 @@ are included in the search.</source>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -15299,17 +15284,11 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -15324,7 +15303,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

34
qucs/qucs_sv.ts
View File

@ -1423,8 +1423,6 @@ men är nu %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1432,7 +1430,6 @@ men är nu %1 !</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7039,9 +7036,6 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7183,7 +7177,6 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8520,13 +8513,13 @@ Väljer alla element i dokumentet</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation type="unfinished">Vrider den valda komponenten 90°</translation>
<translation type="obsolete">Vrider den valda komponenten 90°</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation type="unfinished">Rotera
<translation type="obsolete">Rotera
Vrider den valda komponenten 90° motsols</translation>
</message>
@ -9638,8 +9631,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9662,7 +9653,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12473,8 +12473,6 @@ ingår i sökningen.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -12483,7 +12481,6 @@ ingår i sökningen.</translation>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12837,17 +12834,11 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -12862,7 +12853,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

46
qucs/qucs_tr.ts
View File

@ -1438,8 +1438,6 @@ olmalı fakat şu anda %1 !</translation>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1447,7 +1445,6 @@ olmalı fakat şu anda %1 !</translation>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7035,11 +7032,7 @@ Kullanım: qucsedit [-r] kütük
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">HICUM Seviyesi 0 v1.3 verilog devre elemanı</translation>
=======
<translation type="unfinished">HICUM Seviyesi 0 v1.3 verilog devre elemanı</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7063,19 +7056,11 @@ Kullanım: qucsedit [-r] kütük
</message>
<message>
<source>npn HICUM L0 v1.3</source>
<<<<<<< HEAD
<translation type="obsolete">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="obsolete">pnp HICUM L0 v1.3</translation>
=======
<translation type="unfinished">npn HICUM L0 v1.3</translation>
</message>
<message>
<source>pnp HICUM L0 v1.3</source>
<translation type="unfinished">pnp HICUM L0 v1.3</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>HICUM Level 0 v1.2g verilog device</source>
@ -7106,9 +7091,6 @@ Kullanım: qucsedit [-r] kütük
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7238,7 +7220,6 @@ Kullanım: qucsedit [-r] kütük
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8567,13 +8548,13 @@ Belgenin tüm bilesenlerini seçer</translation>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Seçili bilşeni 90° çevirir</translation>
<translation type="obsolete">Seçili bilşeni 90° çevirir</translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Döndür
<translation type="obsolete">Döndür
Seçili bileşeni saatin tersi yönde 90° çevirir</translation>
</message>
@ -9744,8 +9725,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9768,7 +9747,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -12564,8 +12552,6 @@ Bütün kütüphaneler aranır.</translation>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -12574,7 +12560,6 @@ Bütün kütüphaneler aranır.</translation>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -12929,17 +12914,11 @@ Bir VHDL varlığı iskeleti koyar</translation>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -12954,7 +12933,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

38
qucs/qucs_uk.ts
View File

@ -1430,8 +1430,6 @@ but is %1 !</source>
</message>
</context>
<context>
<<<<<<< HEAD
=======
<name>OctaveWindow</name>
<message>
<source>ERROR: Cannot start Octave!</source>
@ -1439,7 +1437,6 @@ but is %1 !</source>
</message>
</context>
<context>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<name>OptimizeDialog</name>
<message>
<source>Edit Optimization Properties</source>
@ -7030,11 +7027,7 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>HICUM Level 0 v1.3 verilog device</source>
<<<<<<< HEAD
<translation type="obsolete">HICUM Level 0 v1.3 Verilog-модель</translation>
=======
<translation type="unfinished">HICUM Level 0 v1.3 Verilog-модель</translation>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</message>
<message>
<source>high-injection roll-off current</source>
@ -7085,9 +7078,6 @@ Usage: qucsedit [-r] file
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>microchip lange coupler</source>
=======
<source>hybrid (unsymmetrical 3dB coupler)</source>
<translation type="unfinished"></translation>
</message>
@ -7225,7 +7215,6 @@ Usage: qucsedit [-r] file
</message>
<message>
<source>microstrip lange coupler</source>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<translation type="unfinished"></translation>
</message>
<message>
@ -8240,7 +8229,7 @@ Selects all elements of the document</source>
</message>
<message>
<source>Rotates the selected component by 90&#xb0;</source>
<translation>Повертає виділений компонент на 90°</translation>
<translation type="obsolete">Повертає виділений компонент на 90°</translation>
</message>
<message>
<source>Rotate
@ -9519,7 +9508,7 @@ Selects all diagram markers of the document</source>
<source>Rotate
Rotates the selected component by 90&#xb0; counter-clockwise</source>
<translation>Повернути
<translation type="obsolete">Повернути
Повертає виділений компонент на 90° проти годинникової стрілки</translation>
</message>
@ -9853,8 +9842,6 @@ Convert data file to various file formats</source>
<source>Cannot delete %1: &quot;%2&quot;!</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Scripts</source>
<translation type="unfinished"></translation>
@ -9877,7 +9864,16 @@ Convert data file to various file formats</source>
Shows/hides the Octave dock window</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
<message>
<source>Rotates the selected component by 90B0</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rotate
Rotates the selected component by 90B0 counter-clockwise</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QucsAttenuator</name>
@ -11336,8 +11332,6 @@ are included in the search.</source>
<source>Letter portrait</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave Script:</source>
<translation type="unfinished"></translation>
@ -11346,7 +11340,6 @@ are included in the search.</source>
<source>run script after simulation</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>SimMessage</name>
@ -11689,17 +11682,11 @@ Inserts the skeleton of a VHDL entity</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Verilog entity
=======
<source>Verilog module
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
Inserts the skeleton of a Verilog module</source>
<translation type="unfinished"></translation>
</message>
<<<<<<< HEAD
=======
<message>
<source>Octave function</source>
<translation type="unfinished"></translation>
@ -11714,7 +11701,6 @@ Inserts the skeleton of a Verilog module</source>
Inserts the skeleton of a Octave function</source>
<translation type="unfinished"></translation>
</message>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
</context>
<context>
<name>VASettingsDialog</name>

8
qucs/qucsdigi.bat
View File

@ -3,11 +3,7 @@
REM
REM qucsdigi.bat - wrapper script for digital simulation
REM
<<<<<<< HEAD
REM Copyright (C) 2005, 2006, 2009 Stefan Jahn <stefan@lkcc.org>
=======
REM Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REM
REM This is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
@ -25,11 +21,7 @@ REM the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
REM Boston, MA 02110-1301, USA.
REM
<<<<<<< HEAD
if not exist "%6" goto usage
=======
if "X%6"=="X" goto usage
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
set NAME=%1
set NAMEOUT=%2

12
qucs/qucsdigilib.bat
View File

@ -3,11 +3,7 @@
REM
REM qucsdigilib.bat - wrapper script for digital modules and libraries
REM
<<<<<<< HEAD
REM Copyright (C) 2009 Stefan Jahn <stefan@lkcc.org>
=======
REM Copyright (C) 2009, 2011 Stefan Jahn <stefan@lkcc.org>
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
REM
REM This is free software; you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by
@ -25,11 +21,7 @@ REM the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
REM Boston, MA 02110-1301, USA.
REM
<<<<<<< HEAD
if not exist "%4" goto usage
=======
if "X%4"=="X" goto usage
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
set NAME=%1
set DIR=%2
@ -59,11 +51,7 @@ echo compiling functions...
%CXX% %CXXFLAGS% -c %NAME%.cc
echo copying modules to VHDL directory...
<<<<<<< HEAD
copy %NAME%.o vhdl/%LIBRARY%
=======
copy %NAME%.o vhdl\%LIBRARY% > NUL
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
echo updating VHDL library...
%AR% cru vhdl/lib%LIBRARY%.a vhdl/%LIBRARY%/*.o

7
qucs/qucsdoc.cpp
View File

@ -79,15 +79,11 @@ QucsDoc::QucsDoc(QucsApp *App_, const QString& Name_)
QString base = Info.baseName(true);
QString ext = Info.extension(false);
<<<<<<< HEAD
DataSet = base + ".dat"; // name of the default dataset
=======
if(ext == "m" || ext == "oct")
SimTime = "1";
DataSet = base + ".dat"; // name of the default dataset
Script = base + ".m"; // name of the default script
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(ext != "dpl")
DataDisplay = base + ".dpl"; // name of default data display
else {
@ -96,10 +92,7 @@ QucsDoc::QucsDoc(QucsApp *App_, const QString& Name_)
}
}
SimOpenDpl = true;
<<<<<<< HEAD
=======
SimRunScript = false;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
DocChanged = false;
showBias = -1; // don't show DC bias (currently for "Schematic" only)

8
qucs/qucsdoc.h
View File

@ -51,24 +51,16 @@ public:
QString DocName;
QString DataSet; // name of the default dataset
QString DataDisplay; // name of the default data display
<<<<<<< HEAD
=======
QString Script;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
QString SimTime; // used for VHDL simulation, but stored in datadisplay
QDateTime lastSaved;
float Scale;
QucsApp *App;
bool DocChanged;
<<<<<<< HEAD
bool SimOpenDpl; // open data display after simulation ?
int showBias; // -1=no, 0=calculation running, >0=show DC bias points
=======
bool SimOpenDpl; // open data display after simulation ?
bool SimRunScript; // run script after simulation ?
int showBias; // -1=no, 0=calculation running, >0=show DC bias points
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
bool GridOn;
int tmpPosX, tmpPosY;
};

6
qucs/schematic.cpp
View File

@ -252,15 +252,9 @@ void Schematic::setName (const QString& Name_)
if (App) App->DocumentTab->setTabLabel (this, Info.fileName ());
QString base = Info.baseName (true);
<<<<<<< HEAD
qDebug (base);
QString ext = Info.extension (false);
DataSet = base + ".dat";
=======
QString ext = Info.extension (false);
DataSet = base + ".dat";
Script = base + ".m";
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if (ext != "dpl")
DataDisplay = base + ".dpl";
else

25
qucs/schematic_file.cpp
View File

@ -207,18 +207,6 @@ int Schematic::saveSymbolCpp (void)
stream << " // symbol drawing code\n";
for (pp = SymbolPaints.first (); pp != 0; pp = SymbolPaints.next ()) {
if (pp->Name == ".ID ") continue;
<<<<<<< HEAD
pp->Bounding (x1, y1, x2, y2);
if (x1 < xmin) xmin = x1;
if (x2 > xmax) xmax = x2;
if (y1 < ymin) ymin = y1;
if (y2 > ymax) ymax = y2;
if (pp->Name == ".PortSym ") {
if (((PortSymbol*)pp)->numberStr.toInt() > maxNum)
maxNum = ((PortSymbol*)pp)->numberStr.toInt();
continue;
}
=======
if (pp->Name == ".PortSym ") {
if (((PortSymbol*)pp)->numberStr.toInt() > maxNum)
maxNum = ((PortSymbol*)pp)->numberStr.toInt();
@ -235,7 +223,6 @@ int Schematic::saveSymbolCpp (void)
if (x2 > xmax) xmax = x2;
if (y1 < ymin) ymin = y1;
if (y2 > ymax) ymax = y2;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
stream << " " << pp->saveCpp () << "\n";
}
@ -292,11 +279,8 @@ int Schematic::saveDocument()
stream << " <DataSet=" << DataSet << ">\n";
stream << " <DataDisplay=" << DataDisplay << ">\n";
stream << " <OpenDisplay=" << SimOpenDpl << ">\n";
<<<<<<< HEAD
=======
stream << " <Script=" << Script << ">\n";
stream << " <RunScript=" << SimRunScript << ">\n";
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
stream << " <showFrame=" << showFrame << ">\n";
QString t;
@ -396,13 +380,10 @@ bool Schematic::loadProperties(QTextStream *stream)
else if(cstr == "OpenDisplay")
if(nstr.toInt(&ok) == 0) SimOpenDpl = false;
else SimOpenDpl = true;
<<<<<<< HEAD
=======
else if(cstr == "Script") Script = nstr;
else if(cstr == "RunScript")
if(nstr.toInt(&ok) == 0) SimRunScript = false;
else SimRunScript = true;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else if(cstr == "showFrame")
showFrame = nstr.at(0).latin1() - '0';
else if(cstr == "FrameText0") convert2Unicode(Frame_Text0 = nstr);
@ -1376,7 +1357,7 @@ void Schematic::createSubNetlistPlain(QTextStream *stream, QTextEdit *ErrText,
for(pc = DocComps.first(); pc != 0; pc = DocComps.next()) {
if(pc->Model != "Eqn") {
s = pc->get_Verilog_Code(NumPorts);
if(s.at(0) == '§') {
if(s.at(0) == '\A7') {
ErrText->insert(s.mid(1));
}
else (*tstream) << s;
@ -1443,7 +1424,7 @@ void Schematic::createSubNetlistPlain(QTextStream *stream, QTextEdit *ErrText,
for(pc = DocComps.first(); pc != 0; pc = DocComps.next()) {
if(pc->Model != "Eqn") {
s = pc->get_VHDL_Code(NumPorts);
if(s.at(0) == '§') {
if(s.at(0) == '\A7') {
ErrText->insert(s.mid(1));
}
else (*tstream) << s;
@ -1660,7 +1641,7 @@ QString Schematic::createNetlist(QTextStream& stream, int NumPorts)
} else {
s = pc->get_VHDL_Code(NumPorts);
}
if(s.at(0) == '§') return s; // return error
if(s.at(0) == '\A7') return s; // return error
}
stream << s;
}

26
qucs/syntax.cpp
View File

@ -73,12 +73,9 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state)
// ----- current text is a string ----------------------------
else if(iString >= 0) {
setFormat(iString, i-iString+1, QucsSettings.String);
<<<<<<< HEAD
=======
if (language == LANG_OCTAVE)
if(c == '\'')
iString = -1;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(c == '"')
iString = -1;
continue;
@ -154,14 +151,11 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state)
}
continue;
}
<<<<<<< HEAD
=======
// ----- maybe a Octave comment -------------------------------
else if((language == LANG_OCTAVE) && (c == '%' || c == '#')) {
setFormat(i, text.length()-i+1, QucsSettings.Comment);
return state;
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
// ----- no special syntax yet (or anymore) --------------
else {
if((language == LANG_VERILOG || language == LANG_VERILOGA)
@ -183,20 +177,12 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state)
}
if (state < STATE_COMMENT) {
<<<<<<< HEAD
if(c == '\'') {
=======
if(c == '\'' && language != LANG_OCTAVE) {
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
if(i > 1)
if(text.at(i-2) == '\'')
setFormat(i-2, 3, QucsSettings.Character);
}
<<<<<<< HEAD
else if(c == '"')
=======
else if(c == '"' || (c == '\'' && language == LANG_OCTAVE))
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
iString = i;
}
if ((language == LANG_VERILOG || language == LANG_VERILOGA)
@ -365,8 +351,6 @@ pChar VA_List_Functions[] =
{"realtime", "temperature", "vt", "display", "strobe", 0};
// ---------------------------------------------------
<<<<<<< HEAD
=======
// reserved Octave words in alphabetical order
pChar OCT_List_C[] = {"case", "catch", 0};
pChar OCT_List_E[] = {"else", "elseif", "end", "endfor", "endfunction",
@ -398,7 +382,6 @@ pChar OCT_List_Functions[] =
{"plot", 0};
// ---------------------------------------------------
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
void SyntaxHighlighter::markWord(const QString& text, int start, int len)
{
pChar *List;
@ -430,12 +413,9 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len)
case LANG_VERILOG:
List = V_WordList[idx];
break;
<<<<<<< HEAD
=======
case LANG_OCTAVE:
List = OCT_WordList[idx];
break;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
List = VA_WordList[idx];;
break;
@ -459,12 +439,9 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len)
case LANG_VERILOG:
List = V_List_DataTypes;
break;
<<<<<<< HEAD
=======
case LANG_OCTAVE:
List = OCT_List_DataTypes;
break;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
List = VA_List_DataTypes;
break;
@ -527,12 +504,9 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len)
case LANG_VERILOGA:
List = VA_List_Functions;
break;
<<<<<<< HEAD
=======
case LANG_OCTAVE:
List = OCT_List_Functions;
break;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
List = 0;
break;

3
qucs/syntax.h
View File

@ -23,10 +23,7 @@ enum language_type {
LANG_VHDL,
LANG_VERILOG,
LANG_VERILOGA,
<<<<<<< HEAD
=======
LANG_OCTAVE,
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
};
enum textstate_type {

29
qucs/textdoc.cpp
View File

@ -94,14 +94,6 @@ TextDoc::~TextDoc()
void TextDoc::setLanguage (const QString& FileName)
{
QFileInfo Info (FileName);
<<<<<<< HEAD
if (Info.extension (false) == "vhd" || Info.extension (false) == "vhdl")
setLanguage (LANG_VHDL);
else if (Info.extension (false) == "v")
setLanguage (LANG_VERILOG);
else if (Info.extension (false) == "va")
setLanguage (LANG_VERILOGA);
=======
QString ext = Info.extension (false);
if (ext == "vhd" || ext == "vhdl")
setLanguage (LANG_VHDL);
@ -111,7 +103,6 @@ void TextDoc::setLanguage (const QString& FileName)
setLanguage (LANG_VERILOGA);
else if (ext == "m" || ext == "oct")
setLanguage (LANG_OCTAVE);
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
else
setLanguage (LANG_NONE);
}
@ -200,11 +191,8 @@ void TextDoc::setName (const QString& Name_)
DataSet = Info.baseName (true) + ".dat";
DataDisplay = Info.baseName (true) + ".dpl";
<<<<<<< HEAD
=======
if(Info.extension(false) == "m" || Info.extension(false) == "oct")
SimTime = "1";
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
// ---------------------------------------------------
@ -240,9 +228,6 @@ void TextDoc::becomeCurrent (bool)
App->insEntity->setMenuText (tr("Verilog module"));
App->insEntity->setStatusTip (tr("Inserts skeleton of Verilog module"));
App->insEntity->setWhatsThis (
<<<<<<< HEAD
tr("Verilog entity\n\nInserts the skeleton of a Verilog module"));
=======
tr("Verilog module\n\nInserts the skeleton of a Verilog module"));
}
else if (language == LANG_OCTAVE) {
@ -250,7 +235,6 @@ void TextDoc::becomeCurrent (bool)
App->insEntity->setStatusTip (tr("Inserts skeleton of Octave function"));
App->insEntity->setWhatsThis (
tr("Octave function\n\nInserts the skeleton of a Octave function"));
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
App->simulate->setEnabled (true);
App->editActivate->setEnabled (true);
@ -291,13 +275,9 @@ void TextDoc::slotSetChanged()
QPopupMenu *TextDoc::createPopupMenu( const QPoint &pos )
{
QPopupMenu *popup = QTextEdit::createPopupMenu( pos );
<<<<<<< HEAD
App->fileSettings->addTo(popup);
=======
if (language != LANG_OCTAVE) {
App->fileSettings->addTo(popup);
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
return popup;
}
@ -451,12 +431,9 @@ void TextDoc::commentSelected ()
case LANG_VERILOGA:
co = "//"; cl = 2;
break;
<<<<<<< HEAD
=======
case LANG_OCTAVE:
co = "%"; cl = 1;
break;
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
co = ""; cl = 0;
break;
@ -486,12 +463,9 @@ void TextDoc::insertSkeleton ()
else if (language == LANG_VERILOG)
insert ("module ( );\ninput ;\noutput ;\nbegin\n\nend\n"
"endmodule\n\n");
<<<<<<< HEAD
=======
else if (language == LANG_OCTAVE)
insert ("function = ( )\n"
"endfunction\n\n");
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
}
// ---------------------------------------------------
@ -513,14 +487,11 @@ QString TextDoc::getModuleName (void)
VerilogA_File_Info VInfo (text ());
return VInfo.ModuleName;
}
<<<<<<< HEAD
=======
case LANG_OCTAVE:
{
QFileInfo Info (DocName);
return Info.baseName (true);
}
>>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d
default:
return "";
}