Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

WhiteLight Notes 0.9rc2

Release Candidate 2

- Изменена политика выделения тегов в поле тегов.
- Изменен порядок смены фокуса в окне просмотра заметок.
- Добавлено действие "Закрыть" в окно просмотра заметок.
  • Loading branch information...
commit 183bc6a679505516f88ff04c51bd7152f334ed2e 1 parent b96d3f3
@graninas authored
Showing with 89 additions and 56 deletions.
  1. +1 −1  src/LicenseTemplate.txt
  2. +1 −1  src/WhiteLightNotes.pro
  3. +1 −1  src/aboutdialog.cpp
  4. +1 −1  src/aboutdialog.h
  5. +1 −1  src/aboutdialog.ui
  6. +1 −1  src/editnoteform.cpp
  7. +1 −1  src/editnoteform.h
  8. +1 −1  src/handlers/notehandler.cpp
  9. +1 −1  src/handlers/notehandler.h
  10. +1 −1  src/handlers/taggednotehandler.cpp
  11. +1 −1  src/handlers/taggednotehandler.h
  12. +1 −1  src/handlers/taghandler.cpp
  13. +1 −1  src/handlers/taghandler.h
  14. +1 −0  src/icons.qrc
  15. +1 −1  src/main.cpp
  16. +8 −7 src/mainwindow.cpp
  17. +1 −1  src/mainwindow.h
  18. +1 −1  src/note.cpp
  19. +1 −1  src/note.h
  20. +1 −1  src/noteitemdelegate.cpp
  21. +1 −1  src/noteitemdelegate.h
  22. +3 −2 src/notesform.cpp
  23. +1 −1  src/notesform.h
  24. +31 −3 src/notesform.ui
  25. +1 −1  src/notetheme.cpp
  26. +1 −1  src/notetheme.h
  27. +5 −3 src/quickfilterparser.cpp
  28. +1 −1  src/quickfilterparser.h
  29. BIN  src/resources/cross.png
  30. +1 −1  src/settings/settings.h
  31. +1 −1  src/settings/settingsdialog.cpp
  32. +1 −1  src/settings/settingsdialog.h
  33. +1 −1  src/settings/settingsmanager.cpp
  34. +1 −1  src/settings/settingsmanager.h
  35. +1 −1  src/statemachine/event.cpp
  36. +1 −1  src/statemachine/event.h
  37. +1 −1  src/statemachine/state.cpp
  38. +1 −1  src/statemachine/state.h
  39. +1 −1  src/statemachine/statemachine.cpp
  40. +1 −1  src/statemachine/statemachine.h
  41. +1 −1  src/statemachine/transition.cpp
  42. +1 −1  src/statemachine/transition.h
  43. +1 −1  src/statemachine/transtable.cpp
  44. +1 −1  src/statemachine/transtable.h
  45. +1 −1  src/tagsmodel.cpp
  46. +1 −1  src/tagsmodel.h
  47. +1 −1  src/types.h
View
2  src/LicenseTemplate.txt
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/WhiteLightNotes.pro
@@ -1,5 +1,5 @@
#/****************************************************************************
-#** WhiteLight Notes 0.9 rc1
+#** WhiteLight Notes 0.9 rc2
#** Copyright (C) Granin A.S. 2011
#**
#**
View
2  src/aboutdialog.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/aboutdialog.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/aboutdialog.ui
@@ -47,7 +47,7 @@
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">WhiteLight Notes </span><span style=" font-size:10pt;">ver. 0.9 rc1</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">WhiteLight Notes </span><span style=" font-size:10pt;">ver. 0.9 rc2</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt;">© Granin Alexandr 2011</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="graninas@gmail.com"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">graninas@gmail.com</span></a></p>
View
2  src/editnoteform.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/editnoteform.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/handlers/notehandler.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/handlers/notehandler.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/handlers/taggednotehandler.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/handlers/taggednotehandler.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/handlers/taghandler.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/handlers/taghandler.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
1  src/icons.qrc
@@ -47,5 +47,6 @@
<file>resources/folder-open.png</file>
<file>resources/notebook--pencil.png</file>
<file>resources/notebook--minus.png</file>
+ <file>resources/cross.png</file>
</qresource>
</RCC>
View
2  src/main.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
15 src/mainwindow.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
@@ -67,12 +67,6 @@ MainWindow::MainWindow(QWidget *parent) :
QObject::connect(&_notesHotkey, SIGNAL(activated()), this, SLOT(notesFormShowChange()));
QObject::connect(&_createNoteHotkey, SIGNAL(activated()), this, SLOT(editNoteFormShowChange()));
QObject::connect(&_closeAppHotkey, SIGNAL(activated()), this, SLOT(closeApplication()));
-
- QObject::connect(_editNoteForm, SIGNAL(finishNote(Note)), this, SLOT(finishNote(Note)));
- QObject::connect(_editNoteForm, SIGNAL(cancelNoteEditing()), this, SLOT(cancelEditing()));
- QObject::connect(_notesForm, SIGNAL(newNote()), this, SLOT(newNote()));
- QObject::connect(_notesForm, SIGNAL(editNote (Note)), this, SLOT(editNote (Note)));
- QObject::connect(_notesForm, SIGNAL(changeColorTheme(Note,QString)), this, SLOT(changeColorTheme(Note,QString)));
}
MainWindow::~MainWindow()
@@ -95,6 +89,13 @@ void MainWindow::createForms(NotesForm * notesForm,
Q_ASSERT(_notesForm != NULL);
Q_ASSERT(_editNoteForm != NULL);
+
+
+ QObject::connect(_editNoteForm, SIGNAL(finishNote(Note)), this, SLOT(finishNote(Note)));
+ QObject::connect(_editNoteForm, SIGNAL(cancelNoteEditing()), this, SLOT(cancelEditing()));
+ QObject::connect(_notesForm, SIGNAL(newNote()), this, SLOT(newNote()));
+ QObject::connect(_notesForm, SIGNAL(editNote (Note)), this, SLOT(editNote (Note)));
+ QObject::connect(_notesForm, SIGNAL(changeColorTheme(Note,QString)), this, SLOT(changeColorTheme(Note,QString)));
}
void MainWindow::setupForms(const SettingsMap &settings)
View
2  src/mainwindow.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/note.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/note.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/noteitemdelegate.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/noteitemdelegate.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
5 src/notesform.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
@@ -77,7 +77,8 @@ void NotesForm::setSettings(const SettingsMap &settings)
void NotesForm::loadAll()
{
- _quickFilterItems = QuickFilterParser::parse(ui->le_QuickFilter->text(), _defaultSpecificator);
+ _quickFilterItems = QuickFilterParser::parse(ui->le_QuickFilter->text(),
+ _defaultSpecificator);
loadTags ();
loadNotes();
}
View
2  src/notesform.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
34 src/notesform.ui
@@ -32,7 +32,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="windowTitle">
- <string>Notes</string>
+ <string>WhiteLight Notes</string>
</property>
<property name="windowIcon">
<iconset resource="icons.qrc">
@@ -63,7 +63,7 @@
<enum>QFrame::NoFrame</enum>
</property>
<property name="selectionMode">
- <enum>QAbstractItemView::MultiSelection</enum>
+ <enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
@@ -151,6 +151,7 @@
<property name="title">
<string>File</string>
</property>
+ <addaction name="action_Close"/>
</widget>
<widget class="QMenu" name="menuEdit">
<property name="title">
@@ -219,11 +220,22 @@
<string>NewNote...</string>
</property>
</action>
+ <action name="action_Close">
+ <property name="icon">
+ <iconset resource="icons.qrc">
+ <normaloff>:/icons/resources/cross.png</normaloff>:/icons/resources/cross.png</iconset>
+ </property>
+ <property name="text">
+ <string>Close</string>
+ </property>
+ </action>
</widget>
<tabstops>
+ <tabstop>lv_Tags</tabstop>
<tabstop>le_QuickFilter</tabstop>
+ <tabstop>tv_Notes</tabstop>
<tabstop>tb_Clear</tabstop>
- <tabstop>lv_Tags</tabstop>
+ <tabstop>pb_ShowAllTags</tabstop>
</tabstops>
<resources>
<include location="icons.qrc"/>
@@ -309,6 +321,22 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>action_Close</sender>
+ <signal>triggered()</signal>
+ <receiver>NotesForm</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>249</x>
+ <y>223</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
<slots>
<slot>loadTags()</slot>
View
2  src/notetheme.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/notetheme.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
8 src/quickfilterparser.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
@@ -21,9 +21,10 @@
****************************************************************************/
#include "quickfilterparser.h"
-
#include "statemachine/transtable.h"
+#include <QObject>
+
typedef Transition T;
TransTable table()
@@ -32,7 +33,8 @@ TransTable table()
QString n = "n";
QString d = "d";
QString c = "c";
- QString lett = "_0123456789абвгдеёжзийклмнопрстуфхцчшщъыьэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯabefghijklmopqrsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ QString lett = QObject::tr("абвгдеёжзийклмнопрстуфхцчшщъыьэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ")
+ + "_0123456789abefghijklmopqrsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
QString colon = ":";
QString space = " ";
QString pipe = "|";
View
2  src/quickfilterparser.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
BIN  src/resources/cross.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  src/settings/settings.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/settings/settingsdialog.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/settings/settingsdialog.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/settings/settingsmanager.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/settings/settingsmanager.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/event.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/event.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/state.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/state.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/statemachine.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/statemachine.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/transition.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/transition.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/transtable.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/statemachine/transtable.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/tagsmodel.cpp
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/tagsmodel.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
View
2  src/types.h
@@ -1,5 +1,5 @@
/****************************************************************************
-** WhiteLight Notes 0.9 rc1
+** WhiteLight Notes 0.9 rc2
** Copyright (C) Granin A.S. 2011
**
**
Please sign in to comment.
Something went wrong with that request. Please try again.