Git commit 02e55c44a8f42298cde6d5c39e850ed19e43e721 by Yuri Chornoivan. Committed on 31/12/2016 at 07:42. Pushed by yurchor into branch 'master'.
Fix various glitches (typos, empty translation strings etc.) M +4 -4 doc/en/circuits.docbook M +1 -1 doc/en/faq.docbook M +1 -1 doc/en/flowcode.docbook M +5 -1 doc/en/microbe.docbook M +3 -3 doc/en/picprograms.docbook M +3 -3 doc/en/quick.docbook M +1 -1 icons-kde3/nuvola/readme.txt M +3 -3 microbe/microbe.cpp M +1 -1 microbe/microbe.h M +1 -1 microbe/parser.h M +3 -3 src/contexthelp/help-en_US M +6 -2 src/core/ktechlab.kcfg M +2 -2 src/core/main.cpp M +1 -1 src/electronics/gpsimprocessor.cpp M +1 -1 src/electronics/port.h M +1 -1 src/electronics/simulation/elementset.cpp M +1 -1 src/eventinfo.h M +1 -1 src/flowcodeview.cpp M +0 -6 src/gui/asmformattingwidget.ui M +0 -3 src/gui/contexthelpwidget.ui M +1 -16 src/gui/generaloptionswidget.ui M +2 -8 src/gui/gpasmsettingswidget.ui M +0 -3 src/gui/gplinksettingswidget.ui M +0 -3 src/gui/linkeroptionswidget.ui M +0 -3 src/gui/microsettingswidget.ui M +0 -3 src/gui/newfilewidget.ui M +0 -3 src/gui/oscilloscopewidget.ui M +0 -6 src/gui/picprogrammerconfigwidget.ui M +0 -3 src/gui/scopescreenwidget.ui M +0 -60 src/gui/sdccoptionswidget.ui M +2 -2 src/itemdocument.h M +1 -1 src/ktechlab.cpp M +1 -1 src/languages/language.h M +1 -1 src/micro/picinfo.h M +2 -2 src/viewcontainer.h M +1 -1 tests/loaded-icons/test-loaded-icons.cpp https://commits.kde.org/ktechlab/02e55c44a8f42298cde6d5c39e850ed19e43e721 diff --git a/doc/en/circuits.docbook b/doc/en/circuits.docbook index fb7619ae..6f72d393 100644 --- a/doc/en/circuits.docbook +++ b/doc/en/circuits.docbook @@ -8,7 +8,7 @@ <para>Dragging a component from the sidebar into the circuit will place it under the mouse cursor. Alternatively, you can double click on an item in the Components sidebar to repeatedly add it to the circuit. In this mode, a copy of the selected component will be placed repeatedly on mouse left-clicking until either Escape is pressed, or the mouse is right-clicked.</para> - <para>To reposition a component, left-click and drag. You'll find it snapping to the underlying grid. If you drag the component out of the right or bottom edges of the workarea, the workarea will resize itself to accomodate.</para> + <para>To reposition a component, left-click and drag. You'll find it snapping to the underlying grid. If you drag the component out of the right or bottom edges of the workarea, the workarea will resize itself to accommodate.</para> <para>All components have a notion of orientation; 0, 90, 180 and 270 degrees. Those that aren't symmetrical about an axis can also be flipped. To rotate a selection of components, either right click and select from the Orientation menu, or click on the rotate buttons in the toolbar. The latter can also be accessed by pressing the "[" and "]" keys (familiar to Inkscape users). The Item sidebar (on the right) provides a powerful method of setting the orientation by providing previews of the components. Flipping components is also only possibly via the Item sidebar.</para> </sect1> @@ -30,7 +30,7 @@ <title>Component Attributes</title> <para>Most components will have editable attributes, such as the resistance for resistors. By default, you can edit simple attributes in the toolbar, when a group of the same type of components are selected. If your selection contains a mixture of different types of components (such as resistors and capacitors), then no attributes will be displayed for editing.</para> - <para>Some components have more advanced attributes which are not accesible via the toolbar. These are found in the Item sidebar on the right. The diode, for example, has a variety of behavioural characteristics that you can edit here.</para> + <para>Some components have more advanced attributes which are not accessible via the toolbar. These are found in the Item sidebar on the right. The diode, for example, has a variety of behavioural characteristics that you can edit here.</para> <para>If your selection of components have different values for their attributes (for example, different resistances for a selection of resistors), the Item sidebar will have the disagreeing attributes greyed-out. You can enable these by clicking the "Merge properties" button.</para> @@ -43,7 +43,7 @@ <title>Simulation</title> <para>By default, the simulation will be running when you create a new circuit. The status of the simulation is displayed in the lower right of a circuit view, and can be changed via the Tools menu. Firstly - a little explanation on how the Simulator works. This should allow you to make the most out of it.</para> - <para>When a circuit is created or modified, the affected areas are partitioned up into groups of pins and connections that can be considered independent. Each group is then simulated as a seperate entity (although still interacting via the components), with the simulation provided dependent on the group's complexity. Complex groups, such as those involving nonlinear components like LEDs, are slow to simulate. Groups that contain only logic pins, of which only one controls the value on those pins, are the fastest to simulate.</para> + <para>When a circuit is created or modified, the affected areas are partitioned up into groups of pins and connections that can be considered independent. Each group is then simulated as a separate entity (although still interacting via the components), with the simulation provided dependent on the group's complexity. Complex groups, such as those involving nonlinear components like LEDs, are slow to simulate. Groups that contain only logic pins, of which only one controls the value on those pins, are the fastest to simulate.</para> <para>The results of the simulation are provided through several graphical means.</para> @@ -62,7 +62,7 @@ <para>For voltage and current probes, the range of input values can be adjusted in the "Item Editor" sidebar on the right.</para> - <para>Zooming is controlled by a slider. The scaling is logarithmic; for every few pixels that the slider moves along, the zoom factor will be multipled by a constant. &kappname; simulates logic to a maximum precision of 1 microsecond, and at maximum zoom level, one microsecond is represented by 8 pixels.</para> + <para>Zooming is controlled by a slider. The scaling is logarithmic; for every few pixels that the slider moves along, the zoom factor will be multiplied by a constant. &kappname; simulates logic to a maximum precision of 1 microsecond, and at maximum zoom level, one microsecond is represented by 8 pixels.</para> <para>When the scrollbar is dragged to the end, it will remain there as new data is recorded. Otherwise, the position of the scrollbar remains fixed in time. The oscilloscope view can also be moved forwards and backwards by left-clicking and dragging the view. Due to limitations of the underlying widget system, scrolling will be very granular at maximum zoom.</para> diff --git a/doc/en/faq.docbook b/doc/en/faq.docbook index a68e46ed..be8b354d 100644 --- a/doc/en/faq.docbook +++ b/doc/en/faq.docbook @@ -14,7 +14,7 @@ <itemizedlist> <listitem><para>gpsim >= 0.21.4 is not installed. &kappname; does not support gpsim-0.21.2 or gpsim-0.20.14 (or any earlier versions). Later versions may work; but this cannot be tested before they are released. The latest gpsim can be obtained from the <ulink url="http://www.dattalo.com/gnupic/gpsim.html";>gpsim website</ulink>.</para></listitem> <listitem><para>Gpsim is installed, but the header files could not be found. If gpsim is installed in a non-standard location, you may need to specify the location of the header files with "./configure --with-extra-includes=DIR". It is also likely you'll need to specify a library location with the configure option "--with-extra-lib" if the includes are in a non-standard location.</para></listitem> - <listitem><para>Gpsim is installed and the headers are somewhere where configure can find them, but there is some other glib craziness occuring.</para></listitem> + <listitem><para>Gpsim is installed and the headers are somewhere where configure can find them, but there is some other glib craziness occurring.</para></listitem> </itemizedlist> <para>Configure generates the file <computeroutput>config.log</computeroutput> which will contain details of exactly what went wrong. Searching for gpsim in this log should help you decide what's happened. As an example, here is part of the config.log file where one of the gpsim header files is missing:</para> diff --git a/doc/en/flowcode.docbook b/doc/en/flowcode.docbook index d3af4612..6f74dbb0 100644 --- a/doc/en/flowcode.docbook +++ b/doc/en/flowcode.docbook @@ -45,7 +45,7 @@ <para>Many FlowParts, such as subroutines and loops, can contain code of their own. After creating such a container, FlowParts can be added by either dragging or dropping them into the container. The container will be highlighted to indicate that it will become the new parent of the FlowPart.</para> - <para>The container takes responbility for FlowParts nestled inside. If the expand button is unclicked, all contained FlowParts will be hidden - and likewise, the contents will be shown when the expand button is clicked again. Connections cannot be made between FlowParts in different containers, and the contents of a container will be moved about along with the container.</para> + <para>The container takes responsibility for FlowParts nestled inside. If the expand button is unclicked, all contained FlowParts will be hidden - and likewise, the contents will be shown when the expand button is clicked again. Connections cannot be made between FlowParts in different containers, and the contents of a container will be moved about along with the container.</para> </sect1> diff --git a/doc/en/microbe.docbook b/doc/en/microbe.docbook index 8f5fd133..203ceb88 100644 --- a/doc/en/microbe.docbook +++ b/doc/en/microbe.docbook @@ -11,11 +11,13 @@ <programlisting>microbe [options] [input.microbe] [output.asm]</programlisting> where options are: + </para> <itemizedlist> <listitem><para><function>--show-source</function> - Puts each line of µbe; source code as a comment in the assembly output before the assembly instructions themselves for that line.</para></listitem> <listitem><para><function>--no-optimize</function> - Prevent optimization of the instructions generated from the source. Optimization is usually safe, and so this option is mainly used for debugging.</para></listitem> </itemizedlist> + <para> The .microbe input file must identify the target PIC by inserting the PIC name at the top of the .microbe file; e.g. the name of a PIC16F84 is "P16F84". <example><title>Simple complete µbe; program</title> @@ -382,6 +384,7 @@ TRISB = 255 <title>Comparison</title> <para> Supported operations: + </para> <itemizedlist> <listitem><para><emphasis>Equals:</emphasis> x == y</para></listitem> <listitem><para><emphasis>Does not equal:</emphasis> x != y</para></listitem> @@ -391,6 +394,7 @@ TRISB = 255 <listitem><para><emphasis>Is less than or equal to:</emphasis> x <= y</para></listitem> </itemizedlist> + <para> For example: </para> <example><title>Comparison</title> @@ -410,7 +414,7 @@ TRISB = 255 There are several types of events, and some of these take an optional parameter making the condition under which the routine is called more specific. <itemizedlist> - <listitem><para><emphasis>changed <pin name></emphasis> + <listitem><para><emphasis>changed <pin name></emphasis> - Occurs when the state of the specified pin changes. Pin name is in the usual syntax of PORTX.n, e.g. <programlisting>interrupt changed PORTB.4</programlisting></para></listitem> <listitem><para><emphasis>triggered</emphasis> - Rotates the variable x right through carry.</para></listitem> <listitem><para><emphasis>timer</emphasis> - ///TODO</para></listitem> diff --git a/doc/en/picprograms.docbook b/doc/en/picprograms.docbook index e9e33064..858e75a7 100644 --- a/doc/en/picprograms.docbook +++ b/doc/en/picprograms.docbook @@ -19,7 +19,7 @@ <para>None of these actions require the current document to be saved - very useful for when a quick program is required. For non-PIC targets, the Output Dialog invoked on clicking on one of these actions can either output the result (always text in the above three cases) to a fresh document, or to a file. If the output is saved to file, it also provides options to load the file after creation, and adding the newly created file to the open project (if one is open).</para> - <para>Note that you can make &kappname; always use the same view for displaying the outputed content by selecting the option under General Settings.</para> + <para>Note that you can make &kappname; always use the same view for displaying the outputted content by selecting the option under General Settings.</para> </sect1> <sect1 id="uploading"> @@ -27,14 +27,14 @@ <para>&kappname; uses third-party programmers to upload programs to PICs. A variety of common programmers come predefined. Others can be added via the Settings dialog. See the <ulink url="http://ktechlab.org/pic_programmers.php";>&kappname; website</ulink> for more information.</para> - <para>The list of ports is obtained from scanning for serial and parallel ports that are readable and writable. Serial ports are looked for in: + <para>The list of ports is obtained from scanning for serial and parallel ports that are readable and writable. Serial ports are looked for in:</para> <itemizedlist> <listitem><para>/dev/ttyS<emphasis>[0..7]</emphasis></para></listitem> <listitem><para>/dev/tts/<emphasis>[0..7]</emphasis></para></listitem> <listitem><para>/dev/ttyUSB<emphasis>[0..7]</emphasis></para></listitem> <listitem><para>/dev/usb/tts/<emphasis>[0..7]</emphasis></para></listitem> </itemizedlist> - Parallel ports are looked for in: + <para>Parallel ports are looked for in: <itemizedlist> <listitem><para>/dev/usb/parport<emphasis>[0..7]</emphasis></para></listitem> <listitem><para>/dev/usb/parports/<emphasis>[0..7]</emphasis></para></listitem> diff --git a/doc/en/quick.docbook b/doc/en/quick.docbook index 3785ba70..0cf7f293 100644 --- a/doc/en/quick.docbook +++ b/doc/en/quick.docbook @@ -12,7 +12,7 @@ <sect1 id="documents"> <title>Documents</title> - <para>To get started in &kappname;, you will need to create a new document, whose type will depend on your task: + <para>To get started in &kappname;, you will need to create a new document, whose type will depend on your task:</para> <itemizedlist> <listitem><para>&flowcode; Document - Construct a PIC program via flowcharting.</para></listitem> @@ -21,9 +21,9 @@ <listitem><para>Assembly Document - Start writing a PIC assembly program.</para></listitem> </itemizedlist> - &kappname; uses a Document-View model, in that the Document logic is completely seperate from open views of the document. This allows several views of the same file.</para> + <para>&kappname; uses a Document-View model, in that the Document logic is completely separate from open views of the document. This allows several views of the same file.</para> - <para>On creating a new document, the view is created in a seperate tab. Each tab can support any number of views, tiled in any arbitary pattern. This allows, for example, simulating a PIC program in circuit, while stepping through the program in an assembly document in the same tab.</para> + <para>On creating a new document, the view is created in a separate tab. Each tab can support any number of views, tiled in any arbitrary pattern. This allows, for example, simulating a PIC program in circuit, while stepping through the program in an assembly document in the same tab.</para> <para>The contents of tabs can be duplicated by dragging the tab to an empty area on the tab bar. They can be inserted into an existing tab by dragging it onto that tab.</para> diff --git a/icons-kde3/nuvola/readme.txt b/icons-kde3/nuvola/readme.txt index 590166ea..ca278c5e 100644 --- a/icons-kde3/nuvola/readme.txt +++ b/icons-kde3/nuvola/readme.txt @@ -19,7 +19,7 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public -License along with this library (see the the license.txt file); if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +License along with this library (see the license.txt file); if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #######**** NOTE THIS ADD-ON ****####### The GNU Lesser General Public License or LGPL is written for software libraries in the first place. The LGPL has to be considered valid for this artwork diff --git a/microbe/microbe.cpp b/microbe/microbe.cpp index 5e57362f..836fb8d7 100644 --- a/microbe/microbe.cpp +++ b/microbe/microbe.cpp @@ -184,7 +184,7 @@ void Microbe::simplifyProgram() case '{': case '}': - // Put braces on seperate lines + // Put braces on separate lines if ( commentType != None ) break; @@ -297,13 +297,13 @@ void Microbe::compileError( MistakeType type, const QString & context, const Sou message = i18n("Pin list expected"); break; case AliasRedefined: - message = i18n("Alias already definied"); + message = i18n("Alias already defined"); break; case InvalidInterrupt: message = i18n("Interrupt type not supported by target PIC"); break; case InterruptRedefined: - message = i18n("Interrupt already definied"); + message = i18n("Interrupt already defined"); break; case ReadOnlyVariable: message = i18n("Variable '%1' is read only").arg(context); diff --git a/microbe/microbe.h b/microbe/microbe.h index afeac143..99bae73b 100644 --- a/microbe/microbe.h +++ b/microbe/microbe.h @@ -142,7 +142,7 @@ class Microbe }; /** - * Returns a list of errors occured during compilation, intended for + * Returns a list of errors occurred during compilation, intended for * outputting to stderr. */ QString errorReport() const { return m_errorReport; } diff --git a/microbe/parser.h b/microbe/parser.h index b79d0220..f1c25100 100644 --- a/microbe/parser.h +++ b/microbe/parser.h @@ -60,7 +60,7 @@ class Statement */ bool hasBracedCode() const { return !bracedCode.isEmpty(); } /** - * This breaks up the line seperated by spaces,{,and =/ + * This breaks up the line separated by spaces,{,and =/ */ static QStringList tokenise(const QString &line); /** diff --git a/src/contexthelp/help-en_US b/src/contexthelp/help-en_US index c8d14fa8..d2844ab2 100644 --- a/src/contexthelp/help-en_US +++ b/src/contexthelp/help-en_US @@ -60,7 +60,7 @@ The output state is set from the input state when the clock is pulsed. <!-- item: ec/dac --> Converts a digital input to an analog output signal. <!-- item: ec/demultiplexer --> -Seperates the input data stream into components. The value of the input is passed to the "X" output selected by the binary number given by the "A" inputs. +Separates the input data stream into components. The value of the input is passed to the "X" output selected by the binary number given by the "A" inputs. <!-- item: ec/diode --> Allows current to flow in the direction indicated by the arrow when a certain voltage difference has been reached. <!-- item: ec/dpdt_toggle --> @@ -135,7 +135,7 @@ The pins are divided into 3 registers.<br><br><b>Data Pins</b><br><br>The data p <!-- item: ec/pemosfet --> <!-- item: ec/pic --> -The PIC component allows the simulation of a PIC program.<br><br>The loadable PIC program must be one of the following formats:<ul><li>Assembly (.asm)</li><li>FlowCode (.flowcode)</li><li>Symbol file (.cod)</li><li>Microbe (.microbe, .basic)</li><li>C source (.c)</li></ul>Doubleclick on the PIC component to open up the program source file.<br><br>If the program source file is of type assembly, then the the opened text file will automatically be linked to the simulation. You can control the program from the text document using the debug controls.<br><br>Explanation of buttons:<ul><li>Play - Run the PIC program from the point at which it was paused, or from the start otherwise.</li><li>Pause - Pause the simulation at the current execution point.</li><li>Stop - Reset all parts of the simulation.</li><li>Reload - Reread the PIC program from disk and restart gpsim.</li></ul> +The PIC component allows the simulation of a PIC program.<br><br>The loadable PIC program must be one of the following formats:<ul><li>Assembly (.asm)</li><li>FlowCode (.flowcode)</li><li>Symbol file (.cod)</li><li>Microbe (.microbe, .basic)</li><li>C source (.c)</li></ul>Doubleclick on the PIC component to open up the program source file.<br><br>If the program source file is of type assembly, then the opened text file will automatically be linked to the simulation. You can control the program from the text document using the debug controls.<br><br>Explanation of buttons:<ul><li>Play - Run the PIC program from the point at which it was paused, or from the start otherwise.</li><li>Pause - Pause the simulation at the current execution point.</li><li>Stop - Reset all parts of the simulation.</li><li>Reload - Reread the PIC program from disk and restart gpsim.</li></ul> <!-- item: ec/pjfet --> <!-- item: ec/pnpbjt --> @@ -143,7 +143,7 @@ The PIC component allows the simulation of a PIC program.<br><br>The loadable PI <!-- item: ec/potentiometer --> Consists of a resistor connected to the end pins, with a central pin connected at an adjustable point along the resistor <!-- item: ec/probe --> -Connect this probe the the point in the circuit to measure the logic value. The output will be displayed in the Oscilloscope view. +Connect this probe the point in the circuit to measure the logic value. The output will be displayed in the Oscilloscope view. <!-- item: ec/ptb_switch --> <!-- item: ec/ptm_switch --> diff --git a/src/core/ktechlab.kcfg b/src/core/ktechlab.kcfg index 7c38bc5a..362c8b48 100644 --- a/src/core/ktechlab.kcfg +++ b/src/core/ktechlab.kcfg @@ -1,5 +1,9 @@ -<kcfg> - <kcfgfile name="ktechlabrc"/> +<?xml version="1.0" encoding="UTF-8"?> +<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 + http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > + <kcfgfile name="ktechlabrc"/> <group name="General"> <entry name="MaxUndo" type="Int"> diff --git a/src/core/main.cpp b/src/core/main.cpp index c812af58..42e0cbaf 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -36,7 +36,7 @@ int main(int argc, char **argv) KAboutData about(QByteArray("ktechlab"), QByteArray("KTechLab"), ki18n("KTechLab"), VERSION, ki18n(description), KAboutData::License_GPL, ki18n("(C) 2003-2009, The KTechLab developers"), - ki18n(""), "http://ktechlab.org";, "[email protected]" ); + "", "http://ktechlab.org";, "[email protected]" ); about.addAuthor( ki18n("Alan Grimes"), ki18n("developer"), "" ); about.addAuthor( ki18n("Zoltan Padrah"), ki18n("developer") , QByteArray("[email protected]")); about.addCredit( ki18n("Jason Lucas"), ki18n("keeping the project up as a maintainer during the time David left"), "" ); @@ -44,7 +44,7 @@ int main(int argc, char **argv) about.addCredit( ki18n("Julian Bäume"), ki18n("some bug-fixes"), QByteArray("[email protected]") ); about.addCredit( ki18n("David Saxton"), ki18n("former developer, project founder, former maintainer"), QByteArray("[email protected]") ); about.addCredit( ki18n("Daniel Clarke"), ki18n("former developer"), QByteArray("[email protected]") ); - about.addCredit( ki18n("Couriousous"), ki18n("JK flip-flop, asyncronous preset/reset in the D flip-flop."), "" ); + about.addCredit( ki18n("Couriousous"), ki18n("JK flip-flop, asynchronous preset/reset in the D flip-flop."), "" ); about.addCredit( ki18n("John Myers"), ki18n("Rotary Switch"), "" ); about.addCredit( ki18n("Ali Akcaagac"), ki18n("Glib friendliness."), "" ); about.addCredit( ki18n("David Leggett"), ki18n("former Website hosting and feedback during early development."), "" ); diff --git a/src/electronics/gpsimprocessor.cpp b/src/electronics/gpsimprocessor.cpp index 18f43641..cf05401f 100644 --- a/src/electronics/gpsimprocessor.cpp +++ b/src/electronics/gpsimprocessor.cpp @@ -179,7 +179,7 @@ void GpsimProcessor::displayCodLoadStatus( ) break; case CodFailure: case CodUnknown: - KMessageBox::sorry( 0l, i18n("An error occured with the cod file \"%1\".").arg(m_symbolFile), i18n("Error") ); + KMessageBox::sorry( 0l, i18n("An error occurred with the cod file \"%1\".").arg(m_symbolFile), i18n("Error") ); break; } } diff --git a/src/electronics/port.h b/src/electronics/port.h index 82f980af..8b3c1e6b 100644 --- a/src/electronics/port.h +++ b/src/electronics/port.h @@ -51,7 +51,7 @@ class SerialPort : public Port enum Pin { CD = 1, // Carrier detect - RD = 2, // Recieved data + RD = 2, // Received data TD = 3, // Transmitted data DTR = 4, // Data terminal ready GND = 5, // Signal ground diff --git a/src/electronics/simulation/elementset.cpp b/src/electronics/simulation/elementset.cpp index 887f5eaa..af65b7b4 100644 --- a/src/electronics/simulation/elementset.cpp +++ b/src/electronics/simulation/elementset.cpp @@ -59,7 +59,7 @@ ElementSet::~ElementSet() const ElementList::iterator end = m_elementList.end(); for ( ElementList::iterator it = m_elementList.begin(); it != end; ++it ) { // Note: By calling setElementSet(0l), we might have deleted it (the Element will commit - // suicide when both the the ElementSet and Component to which it belongs have deleted + // suicide when both the ElementSet and Component to which it belongs have deleted // themselves). So be very careful it you plan to do anything with the (*it) pointer if (*it) (*it)->elementSetDeleted(); } diff --git a/src/eventinfo.h b/src/eventinfo.h index eaee9d0f..1302b5ae 100644 --- a/src/eventinfo.h +++ b/src/eventinfo.h @@ -21,7 +21,7 @@ class QMouseEvent; class QWheelEvent; /** -Contains information from for a mouse event that occured on a canvas. Like a +Contains information from for a mouse event that occurred on a canvas. Like a QMouseEvent / QEvent / QWheelEvent, but abstracted to the canvas coordinate system, as well as holding lots of useful information. @author David Saxton diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp index 093c02fe..b575a87b 100644 --- a/src/flowcodeview.cpp +++ b/src/flowcodeview.cpp @@ -59,7 +59,7 @@ FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer * QWhatsThis::add( this, i18n( "Construct a FlowCode document by dragging FlowParts from the list on the left. All FlowCharts require an initial \"Start\" part, of which there can only be one.<br><br>" - "Some FlowParts, such as Subroutines, act as a container element for other FlowParts. Drag the items in or out of a container as appropritate. The container that will become the parent of the part being dragged is indicated by being selected.<br><br>" + "Some FlowParts, such as Subroutines, act as a container element for other FlowParts. Drag the items in or out of a container as appropriate. The container that will become the parent of the part being dragged is indicated by being selected.<br><br>" "Note that connections cannot be made between FlowParts in different containers, or at different levels." ) ); diff --git a/src/gui/asmformattingwidget.ui b/src/gui/asmformattingwidget.ui index 8d1738b0..04f8f6e8 100644 --- a/src/gui/asmformattingwidget.ui +++ b/src/gui/asmformattingwidget.ui @@ -10,9 +10,6 @@ <height>241</height> </rect> </property> - <property name="windowTitle"> - <string>Asm Formatting</string> - </property> <property name="whatsThis"> <string>The values control the indentation from the left margin of the various types of assembly code.</string> </property> @@ -155,9 +152,6 @@ <property name="text"> <string>&Automatically format Microbe output</string> </property> - <property name="shortcut"> - <string>Alt+A</string> - </property> </widget> </item> <item> diff --git a/src/gui/contexthelpwidget.ui b/src/gui/contexthelpwidget.ui index 53b26216..54f604cb 100644 --- a/src/gui/contexthelpwidget.ui +++ b/src/gui/contexthelpwidget.ui @@ -165,9 +165,6 @@ <property name="text"> <string>S&ave</string> </property> - <property name="shortcut"> - <string>Alt+A</string> - </property> </widget> </item> </layout> diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui index ad935832..d63d6f63 100644 --- a/src/gui/generaloptionswidget.ui +++ b/src/gui/generaloptionswidget.ui @@ -51,9 +51,6 @@ <property name="text"> <string>Restore opened doc&uments on startup</string> </property> - <property name="shortcut"> - <string>Alt+U</string> - </property> </widget> </item> <item> @@ -61,9 +58,6 @@ <property name="text"> <string>Raise the &appropriate item selector on creating a new document</string> </property> - <property name="shortcut"> - <string>Alt+A</string> - </property> </widget> </item> <item> @@ -71,9 +65,6 @@ <property name="text"> <string>Raise the &Messages log when compiling</string> </property> - <property name="shortcut"> - <string>Alt+M</string> - </property> </widget> </item> </layout> @@ -94,9 +85,6 @@ <property name="text"> <string>Show &grid:</string> </property> - <property name="shortcut"> - <string>Alt+G</string> - </property> </widget> </item> <item row="8" column="1"> @@ -118,7 +106,7 @@ <item row="5" column="0"> <widget class="QLabel" name="textLabel1"> <property name="toolTip"> - <string>Maximum undo steps for work area. This doesn't apply to text documents - that is configurable seperately under Configure Editor.</string> + <string>Maximum undo steps for work area. This doesn't apply to text documents - that is configurable separately under Configure Editor.</string> </property> <property name="text"> <string>Maximum undo steps for work area:</string> @@ -210,9 +198,6 @@ <property name="text"> <string>Show voltage bars &on electronic components</string> </property> - <property name="shortcut"> - <string>Alt+O</string> - </property> </widget> </item> <item row="2" column="0" colspan="2"> diff --git a/src/gui/gpasmsettingswidget.ui b/src/gui/gpasmsettingswidget.ui index 8d084502..fc70f529 100644 --- a/src/gui/gpasmsettingswidget.ui +++ b/src/gui/gpasmsettingswidget.ui @@ -58,9 +58,6 @@ <property name="text"> <string>Ign&ore case (-i)</string> </property> - <property name="shortcut"> - <string>Alt+O</string> - </property> <property name="toolTip" stdset="0"> <string>All user defined symbols and macros are case sensitive. This option makes them case insensitive.</string> </property> @@ -69,10 +66,7 @@ <item row="4" column="0" rowspan="1" colspan="4"> <widget class="QCheckBox" name="kcfg_DosFormat"> <property name="text"> - <string>Generate DOS-formated hex file (-&n)</string> - </property> - <property name="shortcut"> - <string>Alt+N</string> + <string>Generate DOS-formatted hex file (-&n)</string> </property> <property name="toolTip" stdset="0"> <string>By default, gpasm generates hex files using ISO format. However, some device programmers required a DOS formatted file. This option will cause gpasm to generate a DOS formatted hex file. </string> @@ -176,7 +170,7 @@ </sizepolicy> </property> <property name="toolTip" stdset="0"> - <string>This sets the threshold of messages displayed in the log view.<ul><li>"All" will display all output - information, warnings and errors.<li>"Warnings" will supress messages. <li>"Errors" will supress both messages and warnings.</ul></string> + <string>This sets the threshold of messages displayed in the log view.<ul><li>"All" will display all output - information, warnings and errors.<li>"Warnings" will suppress messages. <li>"Errors" will suppress both messages and warnings.</ul></string> </property> <item> <property name="text"> diff --git a/src/gui/gplinksettingswidget.ui b/src/gui/gplinksettingswidget.ui index 9ac63f0c..78b6b382 100644 --- a/src/gui/gplinksettingswidget.ui +++ b/src/gui/gplinksettingswidget.ui @@ -25,9 +25,6 @@ <property name="text"> <string>Link with shared libraries (&use this with new SDCC)</string> </property> - <property name="shortcut"> - <string>Alt+U</string> - </property> </widget> </widget> <layoutdefault spacing="6" margin="11"/> diff --git a/src/gui/linkeroptionswidget.ui b/src/gui/linkeroptionswidget.ui index 2b0f6b10..be6ccf4e 100644 --- a/src/gui/linkeroptionswidget.ui +++ b/src/gui/linkeroptionswidget.ui @@ -72,9 +72,6 @@ <property name="text"> <string>&Output a map file (-m)</string> </property> - <property name="shortcut"> - <string>Alt+O</string> - </property> </widget> </item> <item row="4" column="0"> diff --git a/src/gui/microsettingswidget.ui b/src/gui/microsettingswidget.ui index a7f909a6..0e5dc470 100644 --- a/src/gui/microsettingswidget.ui +++ b/src/gui/microsettingswidget.ui @@ -146,9 +146,6 @@ Drag it to set the type (input/output).</string> <property name="text"> <string>Modif&y</string> </property> - <property name="shortcut"> - <string>Alt+Y</string> - </property> </widget> </item> <item row="1" column="3"> diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui index a10e28ba..b962e160 100644 --- a/src/gui/newfilewidget.ui +++ b/src/gui/newfilewidget.ui @@ -97,9 +97,6 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci <property name="text"> <string>&Add to project</string> </property> - <property name="shortcut"> - <string>Alt+A</string> - </property> <property name="checked"> <bool>true</bool> </property> diff --git a/src/gui/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui index 389424a8..252ea871 100644 --- a/src/gui/oscilloscopewidget.ui +++ b/src/gui/oscilloscopewidget.ui @@ -10,9 +10,6 @@ <height>195</height> </rect> </property> - <property name="windowTitle"> - <string>Form1</string> - </property> <layout class="QGridLayout"> <property name="margin"> <number>0</number> diff --git a/src/gui/picprogrammerconfigwidget.ui b/src/gui/picprogrammerconfigwidget.ui index 2177f3e0..0258d7eb 100644 --- a/src/gui/picprogrammerconfigwidget.ui +++ b/src/gui/picprogrammerconfigwidget.ui @@ -47,9 +47,6 @@ <property name="text"> <string>&Add ...</string> </property> - <property name="shortcut"> - <string>Alt+A</string> - </property> </widget> </item> <item row="1" column="3"> @@ -57,9 +54,6 @@ <property name="text"> <string>Re&move</string> </property> - <property name="shortcut"> - <string>Alt+M</string> - </property> </widget> </item> <item row="0" column="0"> diff --git a/src/gui/scopescreenwidget.ui b/src/gui/scopescreenwidget.ui index 80eb67e1..1afd0e96 100644 --- a/src/gui/scopescreenwidget.ui +++ b/src/gui/scopescreenwidget.ui @@ -10,9 +10,6 @@ <height>248</height> </rect> </property> - <property name="windowTitle"> - <string>Form1</string> - </property> <layout class="QHBoxLayout"> <item> <widget class="ScopeScreenView" name="scopeScreenView" native="true"/> diff --git a/src/gui/sdccoptionswidget.ui b/src/gui/sdccoptionswidget.ui index 78a014d0..a3cba4f8 100644 --- a/src/gui/sdccoptionswidget.ui +++ b/src/gui/sdccoptionswidget.ui @@ -32,9 +32,6 @@ <property name="text"> <string>Don't search in the standard librar&y directory (--nostdlib)</string> </property> - <property name="shortcut"> - <string>Alt+Y</string> - </property> </widget> </item> <item> @@ -52,9 +49,6 @@ <property name="text"> <string>Disa&ble pedantic warnings (--less-pedantic)</string> </property> - <property name="shortcut"> - <string>Alt+B</string> - </property> </widget> </item> <item> @@ -114,9 +108,6 @@ <property name="text"> <string>Stack auto&matic variables (--stack-auto)</string> </property> - <property name="shortcut"> - <string>Alt+M</string> - </property> <property name="toolTip" stdset="0"> <string/> </property> @@ -130,9 +121,6 @@ <property name="text"> <string>Integer li&braries were compiled as reentrant (--int-long-reent)</string> </property> - <property name="shortcut"> - <string>Alt+B</string> - </property> <property name="toolTip" stdset="0"> <string/> </property> @@ -146,9 +134,6 @@ <property name="text"> <string>Floating point librar&y was compiled as reentrant (--float-reent)</string> </property> - <property name="shortcut"> - <string>Alt+Y</string> - </property> <property name="whatsThis" stdset="0"> <string>Floating point library is compiled as reentrant.</string> </property> @@ -169,9 +154,6 @@ <property name="text"> <string>Don't memcpy initialized &xram from code (--no-xinit-opt)</string> </property> - <property name="shortcut"> - <string>Alt+X</string> - </property> <property name="whatsThis" stdset="0"> <string>Will not memcpy initialized data from code space into xdata space. This saves a few bytes in code space if you don't have initialized data.</string> </property> @@ -182,9 +164,6 @@ <property name="text"> <string>Callee will &always save registers used (--all-callee-saves)</string> </property> - <property name="shortcut"> - <string>Alt+A</string> - </property> </widget> </item> <item> @@ -215,9 +194,6 @@ <property name="text"> <string>Disable overlaying leaf function &auto variables (--nooverlay)</string> </property> - <property name="shortcut"> - <string>Alt+A</string> - </property> <property name="whatsThis" stdset="0"> <string>The compiler will not overlay parameters and local variables of any function, see section Parameters and local variables for more details.</string> </property> @@ -238,9 +214,6 @@ <property name="text"> <string>Disable label optimi&zation (--nolabelopt)</string> </property> - <property name="shortcut"> - <string>Alt+Z</string> - </property> <property name="whatsThis" stdset="0"> <string>Will not optimize labels (makes the dumpfiles more readable).</string> </property> @@ -271,9 +244,6 @@ <property name="text"> <string>Disable peep-hole optimization (--&no-peep)</string> </property> - <property name="shortcut"> - <string>Alt+N</string> - </property> <property name="whatsThis" stdset="0"> <string>Disable peep-hole optimization.</string> </property> @@ -297,9 +267,6 @@ <property name="text"> <string>Opti&mize for compact code (--opt-code-size)</string> </property> - <property name="shortcut"> - <string>Alt+M</string> - </property> <property name="whatsThis" stdset="0"> <string>The compiler will optimize code generation towards compact code, possibly at the expense of code speed.</string> </property> @@ -310,9 +277,6 @@ <property name="text"> <string>&Optimize for fast code (--opt-code-speed)</string> </property> - <property name="shortcut"> - <string>Alt+O</string> - </property> <property name="whatsThis" stdset="0"> <string>The compiler will optimize code generation towards fast code, possibly at the expense of code size.</string> </property> @@ -323,9 +287,6 @@ <property name="text"> <string>Ena&ble inline assembly peephole optimization (--peep-asm)</string> </property> - <property name="shortcut"> - <string>Alt+B</string> - </property> <property name="whatsThis" stdset="0"> <string>Pass the inline assembler code through the peep hole optimizer. This can cause unexpected changes to inline assembler code, please go through the peephole optimizer rules defined in the source file tree '<target>/peeph.def' before using this option.</string> </property> @@ -336,9 +297,6 @@ <property name="text"> <string>Don't generate boundary check for &jump tables (--nojtbound)</string> </property> - <property name="shortcut"> - <string>Alt+J</string> - </property> </widget> </item> <item> @@ -389,9 +347,6 @@ <property name="text"> <string>Use large stac&k model (--pstack-model=large)</string> </property> - <property name="shortcut"> - <string>Alt+K</string> - </property> </widget> </item> <item> @@ -399,9 +354,6 @@ <property name="text"> <string>Show more debug info in assembl&y output (--debug-xtra)</string> </property> - <property name="shortcut"> - <string>Alt+Y</string> - </property> </widget> </item> <item> @@ -409,9 +361,6 @@ <property name="text"> <string>E&xplicit enable of peepholes (--denable-peeps)</string> </property> - <property name="shortcut"> - <string>Alt+X</string> - </property> </widget> </item> <item> @@ -419,9 +368,6 @@ <property name="text"> <string>Du&mp call tree in .calltree file (--calltree)</string> </property> - <property name="shortcut"> - <string>Alt+M</string> - </property> </widget> </item> <item> @@ -429,9 +375,6 @@ <property name="text"> <string>Ena&ble stack optimizations (--fstack)</string> </property> - <property name="shortcut"> - <string>Alt+B</string> - </property> </widget> </item> <item> @@ -439,9 +382,6 @@ <property name="text"> <string>Try to use conditional BRA instead of GOTO (--optimi&ze-goto)</string> </property> - <property name="shortcut"> - <string>Alt+Z</string> - </property> </widget> </item> <item> diff --git a/src/itemdocument.h b/src/itemdocument.h index 9ad9107a..a9f5c63f 100644 --- a/src/itemdocument.h +++ b/src/itemdocument.h @@ -175,12 +175,12 @@ class ItemDocument : public Document */ Item* itemWithID( const QString & ); /** - * Returns true if the the user can perform an undo action + * Returns true if the user can perform an undo action * (i.e. the undo stack is not empty) */ virtual bool isUndoAvailable() const; /** - * Returns true if the the user can perform an redo action + * Returns true if the user can perform an redo action * (i.e. the redo stack is not empty) */ virtual bool isRedoAvailable() const; diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp index b81c92ff..ab24b924 100644 --- a/src/ktechlab.cpp +++ b/src/ktechlab.cpp @@ -751,7 +751,7 @@ void KTechlab::setupExampleActions() filesToNames["instrumentation-amplifier.circuit"] = i18n("Instrumentation Amplifier"); filesToNames["astable-multivibrator.circuit"] = i18n("Astable Multivibrator"); filesToNames["inverter.circuit"] = i18n("Inverter"); - filesToNames["scmitt-trigger.circuit"] = i18n("Scmitt Trigger"); + filesToNames["scmitt-trigger.circuit"] = i18n("Schmitt Trigger"); filesToNames["switch.circuit"] = i18n("Switch"); filesToNames["matrix_display.circuit"] = i18n("Matrix Display Driver"); diff --git a/src/languages/language.h b/src/languages/language.h index 065cc230..b9a084b8 100644 --- a/src/languages/language.h +++ b/src/languages/language.h @@ -169,7 +169,7 @@ class ProcessOptions : public ProcessOptionsSpecial * ReuseSameViewForOutput, then the given TextDocument will have its * text set to the output if the TextDocument is not modified and has * an empty url. Otherwise a new TextDocument will be created. Either - * way, once the the processing has finished, a signal will be emitted + * way, once the processing has finished, a signal will be emitted * to the given receiver passing a TextDocument * as an argument. This * is not to be confused with setTextOutputtedTo, which is called once * the processing has finished, and will call-back to the slot given. diff --git a/src/micro/picinfo.h b/src/micro/picinfo.h index cd9d1559..29c6330f 100644 --- a/src/micro/picinfo.h +++ b/src/micro/picinfo.h @@ -15,7 +15,7 @@ /** This is the base class for all 12bit, 14bit and 16bit PICs. -Thanks go to gpsim & Scott Dattalo for some of the the hierachal PIC class +Thanks go to gpsim & Scott Dattalo for some of the hierachal PIC class structure used here :-) @short Base class for all PICMicros @author David Saxton diff --git a/src/viewcontainer.h b/src/viewcontainer.h index d96b6df8..c1fee1e0 100644 --- a/src/viewcontainer.h +++ b/src/viewcontainer.h @@ -50,7 +50,7 @@ class EmptyViewArea : public QWidget /** -Contains either exactly one View, or two ViewAreas, seperated by a QSplitter. +Contains either exactly one View, or two ViewAreas, separated by a QSplitter. If it contains one view, then the value returned in id() is that of the view. If it contains two ViewAreas, then the value returned by id() is -1. @author David Saxton @@ -161,7 +161,7 @@ public: * of a view. * @param relativeViewArea the viewarea to position the new viewarea next to, if -1 then is taken to be the active view area * @param position Top, Right, Bottom or Left of given relativeViewArea - * @returns id of the the view area, or -1 if unsucessful + * @returns id of the view area, or -1 if unsucessful * @param showOpenButton Whether to present the user with the EmptyViewArea * widget (i.e. the new ViewArea is not destined to be immediately filled * with a view). diff --git a/tests/loaded-icons/test-loaded-icons.cpp b/tests/loaded-icons/test-loaded-icons.cpp index 785f3d03..23975025 100644 --- a/tests/loaded-icons/test-loaded-icons.cpp +++ b/tests/loaded-icons/test-loaded-icons.cpp @@ -23,7 +23,7 @@ static void addIcon(QGridLayout *mainLayout, const char *iconName); int main(int argc, char **argv) { KAboutData about(QByteArray("ktechlab"), QByteArray("KTechLab Icon Tester"), ki18n("KTechLab Icon Tester"), VERSION, ki18n(description), KAboutData::License_GPL, ki18n("(C) 2003-2009, The KTechLab developers"), - ki18n(""), "http://ktechlab.org";, "[email protected]" ); + "", "http://ktechlab.org";, "[email protected]" ); KCmdLineArgs::init(argc, argv, &about); KApplication testLoadedIconsApp;
