Skip to content

Commit

Permalink
Fix spelling errors (mostly in comments).
Browse files Browse the repository at this point in the history
These are just the ones caught by krazy, but there don't seem to be too
many string changes.  The main one is that Ressources should be spelled
with one s, not two, and that does affect a few translated strings.
  • Loading branch information
Dr. Robert Marmorstein authored and mattrdash committed Aug 23, 2011
1 parent f23b0a7 commit d0504d5
Show file tree
Hide file tree
Showing 50 changed files with 111 additions and 111 deletions.
2 changes: 1 addition & 1 deletion po/basket.pot
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ msgid ""
msgstr "" msgstr ""


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "" msgstr ""


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/cs.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1472,7 +1472,7 @@ msgstr ""
"odstranit %5basketui.rc</p>" "odstranit %5basketui.rc</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Zdroj nenalezen" msgstr "Zdroj nenalezen"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
4 changes: 2 additions & 2 deletions po/da.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1460,8 +1460,8 @@ msgstr ""
"havde en testversion af det, så forsøg at fjerne filen %5basketui.rc</p>" "havde en testversion af det, så forsøg at fjerne filen %5basketui.rc</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Ressource ikke fundet" msgstr "Resource ikke fundet"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
msgid "Cannot add note." msgid "Cannot add note."
Expand Down
6 changes: 3 additions & 3 deletions po/de.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1276,9 +1276,9 @@ msgstr ""
"sind, dass die Anwendung richtig installiert wurde, sollten Sie versuchen " "sind, dass die Anwendung richtig installiert wurde, sollten Sie versuchen "
"die Datei %5basketui.rc zu entfernen.</p>" "die Datei %5basketui.rc zu entfernen.</p>"


#: src/bnpview.cpp:1901 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Ressource nicht gefunden" msgstr "Resource nicht gefunden"


#: src/bnpview.cpp:1925 src/bnpview.cpp:1934 #: src/bnpview.cpp:1925 src/bnpview.cpp:1934
msgid "Cannot add note." msgid "Cannot add note."
Expand Down
2 changes: 1 addition & 1 deletion po/es.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ msgstr ""
"el fichero %5basketui.rc</p>" "el fichero %5basketui.rc</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Recurso no encontrado" msgstr "Recurso no encontrado"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
4 changes: 2 additions & 2 deletions po/fr.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1457,8 +1457,8 @@ msgstr ""
"essayez de supprimer le fichier %5basketui.rc</p>" "essayez de supprimer le fichier %5basketui.rc</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Ressource non trouvée" msgstr "Resource non trouvée"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
msgid "Cannot add note." msgid "Cannot add note."
Expand Down
2 changes: 1 addition & 1 deletion po/it.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ msgstr ""
"definitiva, prova a rimuovere il file %5basketui.rc</p>" "definitiva, prova a rimuovere il file %5basketui.rc</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Risorsa non trovata" msgstr "Risorsa non trovata"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/ja.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1444,7 +1444,7 @@ msgstr ""
"合は、最後の手段として、ファイル %5basketui.rc を削除してみてください。</p>" "合は、最後の手段として、ファイル %5basketui.rc を削除してみてください。</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "リソースが見つかりません" msgstr "リソースが見つかりません"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/nl.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1444,7 +1444,7 @@ msgid ""
msgstr "" msgstr ""


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "" msgstr ""


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/nn.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ msgstr ""
"5basketui.rc».</p>" "5basketui.rc».</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Fann ikkje resurs" msgstr "Fann ikkje resurs"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/pl_PL.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1465,7 +1465,7 @@ msgstr ""
"5basketui.rg</p>" "5basketui.rg</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Nie znaleziono zasobu" msgstr "Nie znaleziono zasobu"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/pt.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ msgstr ""
"5basketui.rc</p>" "5basketui.rc</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Recurso não Encontrado" msgstr "Recurso não Encontrado"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/ru.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ msgstr ""
"случае, можно попробовать удалить файл %5basketui.rc</p>" "случае, можно попробовать удалить файл %5basketui.rc</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Не найден" msgstr "Не найден"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/tr.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1436,7 +1436,7 @@ msgstr ""
"dosyasını silmeyi deneyin.</p>" "dosyasını silmeyi deneyin.</p>"


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "Kaynak Bulunamadı" msgstr "Kaynak Bulunamadı"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/zh_CN.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1372,7 +1372,7 @@ msgid ""
msgstr "" msgstr ""


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "文件源不存在" msgstr "文件源不存在"


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion po/zh_TW.po
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1420,7 +1420,7 @@ msgid ""
msgstr "" msgstr ""


#: src/bnpview.cpp:1831 #: src/bnpview.cpp:1831
msgid "Ressource not Found" msgid "Resource not Found"
msgstr "" msgstr ""


#: src/bnpview.cpp:1855 src/bnpview.cpp:1864 #: src/bnpview.cpp:1855 src/bnpview.cpp:1864
Expand Down
2 changes: 1 addition & 1 deletion src/archive.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ void Archive::open(const QString &path)
} else { } else {
// We do not know what it is, and we do not care. // We do not know what it is, and we do not care.
} }
// Analyse the Value, if Understood: // Analyze the Value, if Understood:
} }
file.close(); file.close();
} }
Expand Down
2 changes: 1 addition & 1 deletion src/backgroundmanager.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class OpaqueBackgroundEntry
* It get all image names with imageNames() to put them in eg. a QComboBox and then, * It get all image names with imageNames() to put them in eg. a QComboBox and then,
* when it's time to get the preview of an image it call preview() with the image name to get it. * when it's time to get the preview of an image it call preview() with the image name to get it.
* Preview are only computed on demand and then cached to fast the next demands (only the pointer will have to be returned). * Preview are only computed on demand and then cached to fast the next demands (only the pointer will have to be returned).
* Previews are scalled to fit in a rectangle of 100 by 75 pixels, and with a white background color. * Previews are scaled to fit in a rectangle of 100 by 75 pixels, and with a white background color.
* They are also saved to files, so that the scalling/opaquification has not to be done later (they will be directly loaded from file). * They are also saved to files, so that the scalling/opaquification has not to be done later (they will be directly loaded from file).
* Previews are saved in Global::backgroundsFolder()+"previews/", so that emptying the folder is sufficient to remove them. * Previews are saved in Global::backgroundsFolder()+"previews/", so that emptying the folder is sufficient to remove them.
* BASIC FUNCTIONNING OF AN IMAGE REQUESTER: * BASIC FUNCTIONNING OF AN IMAGE REQUESTER:
Expand Down
4 changes: 2 additions & 2 deletions src/backup.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ void BackupDialog::restore()
} }


// Note: The safety backup is not removed now because the code can has been wrong, somehow, or the user perhapse restored an older backup by error... // Note: The safety backup is not removed now because the code can has been wrong, somehow, or the user perhapse restored an older backup by error...
// The restore process will not be called very often (it is possible it will only be called once or twice arround the world during the next years). // The restore process will not be called very often (it is possible it will only be called once or twice around the world during the next years).
// So it is rare enough to force the user to remove the safety folder, but keep him in control and let him safely recover from restoration errors. // So it is rare enough to force the user to remove the safety folder, but keep him in control and let him safely recover from restoration errors.


Backup::setFolderAndRestart(Global::savesFolder()/*No change*/, i18n("Your backup has been successfuly restored to <b>%1</b>. %2 is going to be restarted to take this change into account.")); Backup::setFolderAndRestart(Global::savesFolder()/*No change*/, i18n("Your backup has been successfuly restored to <b>%1</b>. %2 is going to be restarted to take this change into account."));
Expand All @@ -330,7 +330,7 @@ void Backup::figureOutBinaryPath(const char *argv0, QApplication &app)
{ {
/* /*
The application can be launched by two ways: The application can be launched by two ways:
- Globaly (app.applicationFilePath() is good) - Globally (app.applicationFilePath() is good)
- In KDevelop or with an absolute path (app.applicationFilePath() is wrong) - In KDevelop or with an absolute path (app.applicationFilePath() is wrong)
This function is called at the very start of main() so that the current directory has not been changed yet. This function is called at the very start of main() so that the current directory has not been changed yet.
Expand Down
4 changes: 2 additions & 2 deletions src/basketlistview.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ QPixmap BasketListViewItem::circledTextPixmap(const QString &text, int height, c
return pmScaled; return pmScaled;
} }


QPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, bool childsAreLoading, int countChildsFound, const QFont &font, int height) QPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, bool childrenAreLoading, int countChildsFound, const QFont &font, int height)
{ {
if (isLoading) if (isLoading)
return QPixmap(); return QPixmap();
Expand All @@ -277,7 +277,7 @@ QPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, boo
boldFont.setBold(true); boldFont.setBold(true);


QString text; QString text;
if (childsAreLoading) { if (childrenAreLoading) {
if (countChildsFound > 0) if (countChildsFound > 0)
text = i18n("%1+%2+", QString::number(countFound), QString::number(countChildsFound)); text = i18n("%1+%2+", QString::number(countFound), QString::number(countChildsFound));
else else
Expand Down
2 changes: 1 addition & 1 deletion src/basketlistview.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class BasketListViewItem : public QTreeWidgetItem
QString escapedName(const QString &string); QString escapedName(const QString &string);


QPixmap circledTextPixmap(const QString &text, int height, const QFont &font, const QColor &color); QPixmap circledTextPixmap(const QString &text, int height, const QFont &font, const QColor &color);
QPixmap foundCountPixmap(bool isLoading, int countFound, bool childsAreLoading, int countChildsFound, const QFont &font, int height); QPixmap foundCountPixmap(bool isLoading, int countFound, bool childrenAreLoading, int countChildsFound, const QFont &font, int height);
bool haveChildsLoading(); bool haveChildsLoading();
bool haveHiddenChildsLoading(); bool haveHiddenChildsLoading();
bool haveChildsLocked(); bool haveChildsLocked();
Expand Down
20 changes: 10 additions & 10 deletions src/basketview.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ void BasketView::setDisposition(int disposition, int columnCount)
Note *column = firstNote(); Note *column = firstNote();
m_columnsCount = 0; // Now, so relayoutNotes() will not relayout the free notes as if they were columns! m_columnsCount = 0; // Now, so relayoutNotes() will not relayout the free notes as if they were columns!
while (column) { while (column) {
// Move all childs on the first level: // Move all children on the first level:
Note *nextColumn = column->next(); Note *nextColumn = column->next();
ungroupNote(column); ungroupNote(column);
column = nextColumn; column = nextColumn;
Expand Down Expand Up @@ -1262,7 +1262,7 @@ void BasketView::contentsMousePressEvent(QMouseEvent *event)
// If user click the basket, focus it! // If user click the basket, focus it!
// The focus is delayed because if the click results in showing a popup menu, // The focus is delayed because if the click results in showing a popup menu,
// the interface flicker by showing the focused rectangle (as the basket gets focus) // the interface flicker by showing the focused rectangle (as the basket gets focus)
// and immediatly removing it (because the popup menu now have focus). // and immediately removing it (because the popup menu now have focus).
if (!isDuringEdit()) if (!isDuringEdit())
QTimer::singleShot(0, this, SLOT(setFocusIfNotInPopupMenu())); QTimer::singleShot(0, this, SLOT(setFocusIfNotInPopupMenu()));


Expand Down Expand Up @@ -1482,7 +1482,7 @@ void BasketView::contentsMousePressEvent(QMouseEvent *event)
if (event->button() == Qt::LeftButton) { if (event->button() == Qt::LeftButton) {
m_selectionStarted = true; m_selectionStarted = true;
m_selectionBeginPoint = event->pos(); m_selectionBeginPoint = event->pos();
// We usualy invert the selection with the Ctrl key, but some environements (like GNOME or The Gimp) do it with the Shift key. // We usually invert the selection with the Ctrl key, but some environements (like GNOME or The Gimp) do it with the Shift key.
// Since the Shift key has no specific usage, we allow to invert selection ALSO with Shift for Gimp people // Since the Shift key has no specific usage, we allow to invert selection ALSO with Shift for Gimp people
m_selectionInvert = controlPressed || shiftPressed; m_selectionInvert = controlPressed || shiftPressed;
} }
Expand Down Expand Up @@ -1717,7 +1717,7 @@ void BasketView::contentsDragMoveEvent(QDragMoveEvent *event)
} else } else
acceptDropEvent(event);*/ acceptDropEvent(event);*/


// A workarround since QScrollView::dragAutoScroll seem to have no effect : // A workaround since QScrollView::dragAutoScroll seem to have no effect :
// ensureVisible(event->pos().x() + contentsX(), event->pos().y() + contentsY(), 30, 30); // ensureVisible(event->pos().x() + contentsX(), event->pos().y() + contentsY(), 30, 30);
// QScrollView::dragMoveEvent(event); // QScrollView::dragMoveEvent(event);
} }
Expand Down Expand Up @@ -2398,11 +2398,11 @@ void BasketView::unselectAll()
QTextCursor cursor = m_editor->textEdit()->textCursor(); QTextCursor cursor = m_editor->textEdit()->textCursor();
cursor.clearSelection(); cursor.clearSelection();
m_editor->textEdit()->setTextCursor(cursor); m_editor->textEdit()->setTextCursor(cursor);
selectionChangedInEditor(); // THIS IS NOT EMITED BY Qt!!! selectionChangedInEditor(); // THIS IS NOT EMITTED BY Qt!!!
} else if (m_editor->lineEdit()) } else if (m_editor->lineEdit())
m_editor->lineEdit()->deselect(); m_editor->lineEdit()->deselect();
} else { } else {
if (countSelecteds() > 0) // Optimisation if (countSelecteds() > 0) // Optimization
FOR_EACH_NOTE(note) FOR_EACH_NOTE(note)
note->setSelectedRecursively(false); note->setSelectedRecursively(false);
} }
Expand Down Expand Up @@ -3065,7 +3065,7 @@ void BasketView::recomputeBlankRects()


// See the drawing of blank areas in BasketView::drawContents() // See the drawing of blank areas in BasketView::drawContents()
if (hasBackgroundImage() && ! isTiledBackground()) if (hasBackgroundImage() && ! isTiledBackground())
substractRectOnAreas(QRect(0, 0, backgroundPixmap()->width(), backgroundPixmap()->height()), m_blankAreas, false); subtractRectOnAreas(QRect(0, 0, backgroundPixmap()->width(), backgroundPixmap()->height()), m_blankAreas, false);
} }


void BasketView::addAnimatedNote(Note *note) void BasketView::addAnimatedNote(Note *note)
Expand Down Expand Up @@ -3450,7 +3450,7 @@ void BasketView::updateEditorAppearance()
palette.setColor(m_editor->widget()->foregroundRole(), m_editor->note()->textColor()); palette.setColor(m_editor->widget()->foregroundRole(), m_editor->note()->textColor());
m_editor->widget()->setPalette(palette); m_editor->widget()->setPalette(palette);


// Uggly Hack arround Qt bugs: placeCursor() don't call any signal: // Ugly Hack around Qt bugs: placeCursor() don't call any signal:
HtmlEditor *htmlEditor = dynamic_cast<HtmlEditor*>(m_editor); HtmlEditor *htmlEditor = dynamic_cast<HtmlEditor*>(m_editor);
if (htmlEditor) { if (htmlEditor) {
if (m_editor->textEdit()->textCursor().atStart()) { if (m_editor->textEdit()->textCursor().atStart()) {
Expand Down Expand Up @@ -3810,7 +3810,7 @@ NoteSelection* BasketView::selectedNotes()
for (NoteSelection *node = selection.firstChild; node; node = node->next) for (NoteSelection *node = selection.firstChild; node; node = node->next)
node->parent = 0; node->parent = 0;


// If the top-most groups are columns, export only childs of those groups // If the top-most groups are columns, export only children of those groups
// (because user is not consciencious that columns are groups, and don't care: it's not what she want): // (because user is not consciencious that columns are groups, and don't care: it's not what she want):
if (selection.firstChild->note->isColumn()) { if (selection.firstChild->note->isColumn()) {
NoteSelection tmpSelection; NoteSelection tmpSelection;
Expand Down Expand Up @@ -4295,7 +4295,7 @@ void BasketView::noteGroup()
note = nextNote; note = nextNote;
} }


m_loaded = true; // Part 2 / 2 of the workarround! m_loaded = true; // Part 2 / 2 of the workaround!


// Do cleanup: // Do cleanup:
unplugNote(fakeNote); unplugNote(fakeNote);
Expand Down
2 changes: 1 addition & 1 deletion src/basketview.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ private slots:
return m_inserterGroup; return m_inserterGroup;
} }
public slots: public slots:
void doHoverEffects(Note *note, Note::Zone zone, const QPoint &pos = QPoint(0, 0)); /// << @p pos is optionnal and only used to show the link target in the statusbar void doHoverEffects(Note *note, Note::Zone zone, const QPoint &pos = QPoint(0, 0)); /// << @p pos is optional and only used to show the link target in the statusbar
void doHoverEffects(const QPoint &pos); void doHoverEffects(const QPoint &pos);
void doHoverEffects(); // The same, but using the current cursor position void doHoverEffects(); // The same, but using the current cursor position
void mouseEnteredEditorWidget(); void mouseEnteredEditorWidget();
Expand Down
4 changes: 2 additions & 2 deletions src/bnpview.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2035,7 +2035,7 @@ KMenu* BNPView::popupMenu(const QString &menuName)
"file %5basketui.rc</p>", "file %5basketui.rc</p>",
aboutData->programName(), aboutData->programName(), aboutData->programName(), aboutData->programName(),
stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")), stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")),
i18n("Ressource not Found"), KMessageBox::AllowLink); i18n("Resource not Found"), KMessageBox::AllowLink);
} }
if (!isPart()) if (!isPart())
exit(1); // We SHOULD exit right now and abord everything because the caller except menu != 0 to not crash. exit(1); // We SHOULD exit right now and abord everything because the caller except menu != 0 to not crash.
Expand Down Expand Up @@ -2670,7 +2670,7 @@ void BNPView::setActive(bool active)


if (active == isMainWindowActive()) if (active == isMainWindowActive())
return; return;
kapp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag throught systray" kapp->updateUserTimestamp(); // If "activate on mouse hovering systray", or "on drag through systray"
Global::systemTray->toggleActive(); Global::systemTray->toggleActive();
} }


Expand Down
4 changes: 2 additions & 2 deletions src/colorpicker.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class DesktopColorPicker : public QDesktopWidget
~DesktopColorPicker(); ~DesktopColorPicker();
public slots: public slots:
/** Begin color picking. /** Begin color picking.
* This function returns immediatly, and pickedColor() is emitted if user has * This function returns immediately, and pickedColor() is emitted if user has
* choosen a color, and not canceled the process (by pressing Escape). * chozen a color, and not canceled the process (by pressing Escape).
*/ */
void pickColor(); void pickColor();
signals: signals:
Expand Down
2 changes: 1 addition & 1 deletion src/debugwindow.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class QTextBrowser;
class QString; class QString;
class QCloseEvent; class QCloseEvent;


/**A simple window that display text through debuging messages. /**A simple window that display text through debugging messages.
*@author Sébastien Laoût *@author Sébastien Laoût
*/ */


Expand Down
2 changes: 1 addition & 1 deletion src/focusedwidgets.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void FocusedTextEdit::keyPressEvent(QKeyEvent *event)


KTextEdit::keyPressEvent(event); KTextEdit::keyPressEvent(event);


// Workaround (for ensuring the cursor to be visible): signal not emited when pressing those keys: // Workaround (for ensuring the cursor to be visible): signal not emitted when pressing those keys:
if (event->key() == Qt::Key_Home if (event->key() == Qt::Key_Home
|| event->key() == Qt::Key_End || event->key() == Qt::Key_End
|| event->key() == Qt::Key_PageUp || event->key() == Qt::Key_PageUp
Expand Down
14 changes: 7 additions & 7 deletions src/htmlexporter.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void HTMLExporter::prepareExport(BasketView *basket, const QString &fullPath)
progress->setValue(0); progress->setValue(0);
kapp->processEvents(); kapp->processEvents();


// Remember the file path choosen by the user: // Remember the file path chozen by the user:
filePath = fullPath; filePath = fullPath;
fileName = KUrl(fullPath).fileName(); fileName = KUrl(fullPath).fileName();
exportedBasket = basket; exportedBasket = basket;
Expand Down Expand Up @@ -448,15 +448,15 @@ void HTMLExporter::exportNote(Note *note, int indent)
} }
stream << '\n' << spaces.fill(' ', indent) << "</table>\n" /*<< spaces.fill(' ', indent - 1)*/; stream << '\n' << spaces.fill(' ', indent) << "</table>\n" /*<< spaces.fill(' ', indent - 1)*/;
} else { } else {
// Additionnal class for the content (link, netword, color...): // Additional class for the content (link, netword, color...):
QString additionnalClasses = note->content()->cssClass(); QString additionalClasses = note->content()->cssClass();
if (!additionnalClasses.isEmpty()) if (!additionalClasses.isEmpty())
additionnalClasses = " " + additionnalClasses; additionalClasses = " " + additionalClasses;
// Assign the style of each associted tags: // Assign the style of each associted tags:
for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it) for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it)
additionnalClasses += " tag_" + (*it)->id(); additionalClasses += " tag_" + (*it)->id();
//stream << spaces.fill(' ', indent); //stream << spaces.fill(' ', indent);
stream << "<table class=\"note" << additionnalClasses << "\"" << freeStyle << "><tr>"; stream << "<table class=\"note" << additionalClasses << "\"" << freeStyle << "><tr>";
if (note->emblemsCount() > 0) { if (note->emblemsCount() > 0) {
stream << "<td class=\"tags\"><nobr>"; stream << "<td class=\"tags\"><nobr>";
for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it) for (State::List::Iterator it = note->states().begin(); it != note->states().end(); ++it)
Expand Down
2 changes: 1 addition & 1 deletion src/htmlexporter.h
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class HTMLExporter
QString copyFile(const QString &srcPath, bool createIt); QString copyFile(const QString &srcPath, bool createIt);


public: public:
// Absolute path of the file name the user choosen: // Absolute path of the file name the user chozen:
QString filePath; // eg.: "/home/seb/foo.html" QString filePath; // eg.: "/home/seb/foo.html"
QString fileName; // eg.: "foo.html" QString fileName; // eg.: "foo.html"


Expand Down
Loading

0 comments on commit d0504d5

Please sign in to comment.