Commit 330de6c6 authored by Jekyll Wu's avatar Jekyll Wu

Fix some spelling problems

parent d601bd73
......@@ -404,8 +404,8 @@ void Application::toggleBackgroundInstance()
{
_backgroundInstance->show();
// ensure that the active terminal display has the focus.
// without this, an odd problem occurred where the focus widgetwould change
// each time the background instance was shown
// without this, an odd problem occurred where the focus widget would change
// each time the background instance was shown
_backgroundInstance->viewManager()->activeView()->setFocus();
}
else
......@@ -446,7 +446,7 @@ Session* Application::createSession(Profile::Ptr profile, const QString& directo
session->setInitialWorkingDirectory(directory);
// create view before starting the session process so that the session doesn't suffer
// a change in terminal size right after the session starts. some applications such as GNU Screen
// a change in terminal size right after the session starts. Some applications such as GNU Screen
// and Midnight Commander don't like this happening
viewManager->createView(session);
......
......@@ -61,7 +61,7 @@ public:
/**
* Constructs a new bookmark handler for Konsole bookmarks.
*
* @param collection The collection which the boomark menu's actions should be added to
* @param collection The collection which the bookmark menu's actions should be added to
* @param menu The menu which the bookmark actions should be added to
* @param toplevel TODO: Document me
* @param parent The parent object
......@@ -104,7 +104,7 @@ signals:
* Emitted when the user selects 'Open Folder in Tabs'
* from the bookmark menu.
*
* @param urls The urls of the bookmarks in the folder whoose
* @param urls The urls of the bookmarks in the folder whose
* 'Open Folder in Tabs' action was triggered
*/
void openUrls( const QList<KUrl>& urls );
......
......@@ -131,8 +131,8 @@ extern const ColorEntry base_color_table[TABLE_COLORS] KDE_NO_EXPORT;
3 - Index(256) - u: 16..255 v:0 w:0
4 - RGB - u: 0..255 v:0..256 w:0..256
Default colour space has two separate colours, namely
default foreground and default background colour.
Default color space has two separate colors, namely
default foreground and default background color.
*/
#define COLOR_SPACE_UNDEFINED 0
......@@ -149,7 +149,7 @@ class CharacterColor
friend class Character;
public:
/** Constructs a new CharacterColor whoose color and color space are undefined. */
/** Constructs a new CharacterColor whose color and color space are undefined. */
CharacterColor()
: _colorSpace(COLOR_SPACE_UNDEFINED),
_u(0),
......
......@@ -213,7 +213,7 @@ bool ColorScheme::randomizedBackgroundColor() const
}
void ColorScheme::setRandomizedBackgroundColor(bool randomize)
{
// the hue of the background colour is allowed to be randomly
// the hue of the background color is allowed to be randomly
// adjusted as much as possible.
//
// the value and saturation are left alone to maintain read-ability
......
......@@ -79,7 +79,7 @@ class ColorScheme
{
public:
/**
* Constructs a new color scheme which is initialised to the default color set
* Constructs a new color scheme which is initialized to the default color set
* for Konsole.
*/
ColorScheme();
......@@ -198,10 +198,10 @@ private:
// this is the default color table.
const ColorEntry* colorTable() const;
// reads a single colour entry from a KConfig source
// reads a single color entry from a KConfig source
// and sets the palette entry at 'index' to the entry read.
void readColorEntry(KConfig& config , int index);
// writes a single colour entry to a KConfig source
// writes a single color entry to a KConfig source
void writeColorEntry(KConfig& config , const QString& colorName, const ColorEntry& entry,const RandomizationRange& range) const;
// sets the amount of randomization allowed for a particular color
......@@ -271,7 +271,7 @@ public:
ColorScheme* read();
private:
// reads a line from the file specifying a colour palette entry
// reads a line from the file specifying a color palette entry
// format is: color [index] [red] [green] [blue] [transparent] [bold]
bool readColorLine(const QString& line , ColorScheme* scheme);
bool readTitleLine(const QString& line , ColorScheme* scheme);
......
......@@ -38,7 +38,7 @@ class ColorScheme;
/**
* A dialog for editing color schemes.
*
* After creation, the dialog can be initialised with the settings
* After creation, the dialog can be initialized with the settings
* of a color scheme using the setup() method.
*
* The dialog creates a copy of the supplied color scheme to which
......@@ -56,7 +56,7 @@ public:
ColorSchemeEditor(QWidget* parent = 0);
virtual ~ColorSchemeEditor();
/** Initialises the dialog with the properties of the specified color scheme. */
/** Initializes the dialog with the properties of the specified color scheme. */
void setup(const ColorScheme* scheme);
/** Returns the modified color scheme. */
ColorScheme* colorScheme() const;
......
......@@ -80,7 +80,7 @@ EditProfileDialog::EditProfileDialog(QWidget* parent)
_ui = new Ui::EditProfileDialog();
_ui->setupUi(mainWidget());
// TODO: Renable in a later KDE 4.x release when this feature works again
// TODO: Re-enable in a later KDE 4.x release when this feature works again
_ui->enableResizeWindowButton->setVisible(false);
// there are various setupXYZPage() methods to load the items
......
......@@ -48,7 +48,7 @@ namespace Konsole
/**
* A dialog which allows the user to edit a profile.
* After the dialog is created, it can be initialised with the settings
* After the dialog is created, it can be initialized with the settings
* for a profile using setProfile(). When the user makes changes to the
* dialog and accepts the changes, the dialog will update the
* profile in the SessionManager by calling the SessionManager's
......@@ -69,7 +69,7 @@ public:
virtual ~EditProfileDialog();
/**
* Initialises the dialog with the settings for the specified session
* Initializes the dialog with the settings for the specified session
* type.
*
* When the dialog closes, the profile will be updated in the SessionManager
......
......@@ -392,7 +392,7 @@ void Emulation::setImageSize(int lines, int columns)
_imageSizeInitialized = true;
// FIXME
// a hard-coded, small delay is introduced to gurarantee Session::run()
// a hard-coded, small delay is introduced to guarantee Session::run()
// does not get triggered by SIGNAL(imageSizeInitialized()) before
// Pty::setWindowSize() is triggered by previously emitted
// SIGNAL(imageSizeChanged()); See #203185
......
......@@ -101,7 +101,7 @@ public:
*/
Type type() const;
/**
* Causes the an action associated with a hotspot to be triggered.
* Causes the action associated with a hotspot to be triggered.
*
* @param object The object which caused the hotspot to be triggered. This is
* typically null ( in which case the default action should be performed ) or
......
......@@ -47,8 +47,8 @@ using namespace Konsole;
or newlines, but access it randomly.
The model is that of an arbitrary wide typewriter scroll
in that the scroll is a serie of lines and each line is
a serie of cells with no overwriting permitted.
in that the scroll is a series of lines and each line is
a series of cells with no overwriting permitted.
The implementation provides arbitrary length and numbers
of cells and line/column indexed read access to the scroll
......@@ -180,7 +180,7 @@ bool HistoryScroll::hasScroll()
/*
The history scroll makes a Row(Row(Cell)) from
two history buffers. The index buffer contains
start of line positions which refere to the cells
start of line positions which refer to the cells
buffer.
Note that index[0] addresses the second line
......
......@@ -69,7 +69,7 @@ private:
//pointer to start of mmap'ed file data, or 0 if the file is not mmap'ed
char* _fileMap;
//incremented whenver 'add' is called and decremented whenever
//incremented whenever 'add' is called and decremented whenever
//'get' is called.
//this is used to detect when a large number of lines are being read and processed from the history
//and automatically mmap the file for better performance (saves the overhead of many lseek-read calls).
......
......@@ -67,7 +67,7 @@ HistorySizeDialog::HistorySizeDialog( QWidget* parent )
_lineCountBox = new KIntSpinBox(this);
// minimum lines = 1 ( for 0 lines , "No History" mode should be used instead )
// maximum lines is abritrarily chosen, I do not think it is sensible to allow this
// maximum lines is arbitrarily chosen, I do not think it is sensible to allow this
// to be set to a very large figure because that will use large amounts of memory,
// if a very large log is required, "Unlimited History" mode should be used
_lineCountBox->setRange( 1 , 100000 );
......
......@@ -41,7 +41,7 @@ class KeyboardTranslator;
* the character sequence sent to the terminal when those
* combinations are pressed.
*
* The dialog can be initialised with the settings of an
* The dialog can be initialized with the settings of an
* existing key bindings list using the setup() method.
*
* The dialog creates a copy of the supplied keyboard translator
......@@ -58,7 +58,7 @@ public:
virtual ~KeyBindingEditor();
/**
* Intialises the dialog with the bindings and other settings
* Initializes the dialog with the bindings and other settings
* from the specified @p translator.
*/
void setup(const KeyboardTranslator* translator);
......
......@@ -567,7 +567,7 @@ void MainWindow::showEvent(QShowEvent *event)
// setMenuBarInitialVisibility() is triggered, the initial visibility of
// menubar should be applied at this last moment. Otherwise, the initial
// visibility will be determined by what is stored in konsolerc, but not
// by the the selected profile.
// by the selected profile.
//
menuBar()->setVisible( _menuBarInitialVisibility );
_toggleMenuBarAction->setChecked( _menuBarInitialVisibility );
......
......@@ -173,7 +173,7 @@ public:
* character and returns a string with the markers replaced
* with information from this process description.
* <br>
* The markers recognised are:
* The markers recognized are:
* <ul>
* <li> %u - Name of the user which owns the process. </li>
* <li> %n - Replaced with the name of the process. </li>
......
......@@ -71,7 +71,7 @@ class HistoryScroll;
The screen image has a selection associated with it, specified using
setSelectionStart() and setSelectionEnd(). The selected text can be retrieved
using selectedText(). When getImage() is used to retrieve the visible image,
characters which are part of the selection have their colours inverted.
characters which are part of the selection have their colors inverted.
*/
class Screen
{
......
......@@ -165,7 +165,7 @@ public:
/**
* Sets the format used by this session for tab titles.
*
* @param context The context whoose format should be set.
* @param context The context whose format should be set.
* @param format The tab title format. This may be a mixture
* of plain text and dynamic elements denoted by a '%' character
* followed by a letter. (eg. %d for directory). The dynamic
......@@ -751,7 +751,7 @@ public:
* Changes or activity in the group's master sessions may be propagated
* to all the sessions in the group, depending on the current masterMode()
*
* @param session The session whoose master status should be changed.
* @param session The session whose master status should be changed.
* @param master True to make this session a master or false otherwise
*/
void setMasterStatus( Session* session , bool master );
......
......@@ -424,8 +424,8 @@ public:
{
/** Searches forwards through the output, starting at the current selection. */
ForwardsSearch,
/** Searches backwars through the output, starting at the current selection. */
BackwardsSearch
/** Searches backwards through the output, starting at the current selection. */
BackwardsSearch
};
/**
......
......@@ -282,7 +282,7 @@ signals:
/**
* Emitted when the shortcut for a profile is changed.
*
* @param profile The profile whoose status was changed
* @param profile The profile whose status was changed
* @param newShortcut The new shortcut key sequence for the profile
*/
void shortcutChanged(Profile::Ptr profile , const QKeySequence& newShortcut);
......
......@@ -197,7 +197,7 @@ void HTMLDecoder::decodeLine(const Character* const characters, int count, LineP
if ( _lastRendition & RE_UNDERLINE )
style.append("font-decoration:underline;");
//colours - a colour table must have been defined first
//colors - a color table must have been defined first
if ( _colorTable )
{
style.append( QString("color:%1;").arg(_lastForeColor.color(_colorTable).name() ) );
......
......@@ -37,9 +37,9 @@ namespace Konsole
* Base class for terminal character decoders
*
* The decoder converts lines of terminal characters which consist of a unicode character, foreground
* and background colours and other appearance-related properties into text strings.
* and background colors and other appearance-related properties into text strings.
*
* Derived classes may produce either plain text with no other colour or appearance information, or
* Derived classes may produce either plain text with no other color or appearance information, or
* they may produce text which incorporates these additional properties.
*/
class TerminalCharacterDecoder
......@@ -66,7 +66,7 @@ public:
};
/**
* A terminal character decoder which produces plain text, ignoring colours and other appearance-related
* A terminal character decoder which produces plain text, ignoring colors and other appearance-related
* properties of the original characters.
*/
class PlainTextDecoder : public TerminalCharacterDecoder
......@@ -122,7 +122,7 @@ public:
HTMLDecoder();
/**
* Sets the colour table which the decoder uses to produce the HTML colour codes in its
* Sets the color table which the decoder uses to produce the HTML color codes in its
* output
*/
void setColorTable( const ColorEntry* table );
......
......@@ -643,7 +643,7 @@ void TerminalDisplay::drawCursor(QPainter& painter,
if ( !_cursorColor.isValid() )
{
// invert the colour used to draw the text to ensure that the character at
// invert the color used to draw the text to ensure that the character at
// the cursor position is readable
invertCharacterColor = true;
}
......@@ -1318,7 +1318,7 @@ void TerminalDisplay::paintFilters(QPainter& painter)
// drawn on top of them
else if ( spot->type() == Filter::HotSpot::Marker )
{
//TODO - Do not use a hardcoded colour for this
//TODO - Do not use a hardcoded color for this
painter.fillRect(r,QBrush(QColor(255,0,0,120)));
}
}
......
......@@ -475,7 +475,7 @@ public slots:
void outputSuspended(bool suspended);
/**
* Sets whether the program whoose output is being displayed in the view
* Sets whether the program whose output is being displayed in the view
* is interested in mouse events.
*
* If this is set to true, mouse signals will be emitted by the view when the user clicks, drags
......@@ -611,7 +611,7 @@ protected slots:
void blinkTextEvent();
void blinkCursorEvent();
//Renables bell noises and visuals. Used to disable further bells for a short period of time
//Re-enables bell noises and visuals. Used to disable further bells for a short period of time
//after emitting the first in a sequence of bell events.
void enableBell();
......
......@@ -47,7 +47,7 @@ void fillCommandLineOptions(KCmdLineOptions& options);
// process, or re-use an existing konsole process.
bool shouldUseNewProcess();
// resotre sessions saved by KDE.
// restore sessions saved by KDE.
void restoreSession(Application& app);
// ***
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment