Merge pull request #56 from nuttyartist/dev

Merge dev to master

packaging/linux/deb/notes-0.8.0/Notes.desktop → packaging/linux/deb/notes-0.9.0/Notes.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.8
+Version=0.9
 Type=Application
 Terminal=false
 StartupNotify=true

packaging/linux/deb/notes-0.8.0/debian/changelog → packaging/linux/deb/notes-0.9.0/debian/changelog

@@ -1,3 +1,9 @@
+notes (0.9.0) stable; urgency=low
+
+  * Second release
+
+ -- Nutty Artist <[email protected]>>  Tue, 3 May 2016 01:00:00 +0100
+
 notes (0.8.0) stable; urgency=low
 
   * Initial release

packaging/linux/deb/notes-0.8.0/debian/control → packaging/linux/deb/notes-0.9.0/debian/control

@@ -2,13 +2,13 @@ source: notes
 Section: utils
 Priority: optional
 Maintainer: Nutty Artist <[email protected]>
-Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake
+Build-Depends: debhelper (>= 9), qtbase5-dev (>= 5.2), qtbase5-dev-tools (>= 5.2), qt5-qmake
 Standards-Version: 3.9.6
 Homepage: http://www.get-notes.com/
 
 Package: notes
 Architecture: any
-Depends: libqt5gui5, libqt5widgets5, libqt5core5a, ${misc:Depends}, ${shlibs:Depends}
+Depends: libqt5gui5 (>= 5.2), libqt5widgets5 (>= 5.2), libqt5core5a (>= 5.2), ${misc:Depends}, ${shlibs:Depends}
 Description: Note taking application, write down your thoughts.
  Notes is a tool for the things you need to write down off your 
  brain. It is your place of expressing yourself. Notes is an open

packaging/windows/Notes_Inno_Script.iss

@@ -4,17 +4,18 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{44576435-E098-4581-A6D7-FD7FADC5B063}
 AppName=Notes
-AppVersion=0.8.0
+AppVersion=0.9.0
 AppPublisher=Awesomeness
 AppPublisherURL=http://www.get-notes.com/
 AppSupportURL=http://www.get-notes.com/
 AppUpdatesURL=http://www.get-notes.com/
-DefaultDirName={pf}\Notes 0.8.0
+DefaultDirName={pf}\Notes 0.9.0
 DefaultGroupName=Notes
 OutputDir=C:\Users\user\Documents
 OutputBaseFilename=NotesSetup
 Compression=lzma
 SolidCompression=yes
+ArchitecturesInstallIn64BitMode=x64
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -23,19 +24,36 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "C:\Users\user\Documents\notes\bin\Notes.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\D3Dcompiler_47.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\libEGL.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\libGLESV2.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\opengl32sw.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\Qt5Svg.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\user\Documents\notes\bin\platforms\*"; DestDir: "{app}\platforms"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\user\Documents\notes\bin\translations\*"; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\user\Documents\notes\bin\imageformats\*"; DestDir: "{app}\imageformats"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\user\Documents\notes\bin\iconengines\*"; DestDir: "{app}\iconengines"; Flags: ignoreversion recursesubdirs createallsubdirs
+;x-64
+Source: "C:\Users\user\Documents\notes\bin\64\Notes.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\D3Dcompiler_47.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\libEGL.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\libGLESV2.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\opengl32sw.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\Qt5Svg.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\platforms\*"; DestDir: "{app}\platforms"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\translations\*"; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\imageformats\*"; DestDir: "{app}\imageformats"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\64\iconengines\*"; DestDir: "{app}\iconengines"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode
+;x-86
+Source: "C:\Users\user\Documents\notes\bin\32\Notes.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\D3Dcompiler_47.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\libEGL.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\libGLESV2.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\opengl32sw.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\Qt5Svg.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\platforms\*"; DestDir: "{app}\platforms"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\translations\*"; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\imageformats\*"; DestDir: "{app}\imageformats"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
+Source: "C:\Users\user\Documents\notes\bin\32\iconengines\*"; DestDir: "{app}\iconengines"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: not Is64BitInstallMode
 
 [Icons]
 Name: "{group}\Notes"; Filename: "{app}\Notes.exe"

src/notewidgetdelegate.cpp

@@ -25,8 +25,13 @@ NoteWidgetDelegate::NoteWidgetDelegate(QObject *parent)
       m_isActive(false)
 {
 #ifdef __APPLE__
+    m_titleFont = QFont(QStringLiteral("Helvetica"), 10,QFont::Bold);
+    m_dateFont = QFont(QStringLiteral("Helvetica"), 8);
     m_titleFont.setPointSize(13);
-    m_dateFont.setPointSize(10);
+    m_dateFont.setPointSize(11);
+#elif _WIN32
+    m_titleFont = QFont(QStringLiteral("Arial"), 10, QFont::Bold);
+    m_dateFont = QFont(QStringLiteral("Arial"), 8);
 #endif
 
     m_timeLine = new QTimeLine(300, this);
@@ -211,6 +216,11 @@ void NoteWidgetDelegate::paintDateTime(QPainter *painter, const QStyleOptionView
     double currRowHeight = m_rowHeight * rowHeightRate;
     double textRectPosX = rowPosX + 10;
     double textRectWidth = rowWidth - textRectPosX - 10;
+#ifdef __APPLE__
+    int bottomOffset = 5;
+#else
+    int bottomOffset = 3;
+#endif
 
     if(index.row() == m_animatedIndex.row()){
         if(m_state == MoveIn){
@@ -221,19 +231,19 @@ void NoteWidgetDelegate::paintDateTime(QPainter *painter, const QStyleOptionView
         }else{
 
             double textRectHeight = fm.height() + 2;
-            double textRectPosY = rowPosY + currRowHeight - (textRectHeight + 3);
+            double textRectPosY = rowPosY + currRowHeight - (textRectHeight + bottomOffset);
 
-            if(currRowHeight <= (textRectHeight + 3)){
+            if(currRowHeight <= (textRectHeight + bottomOffset)){
                 textRectPosY = rowPosY;
-                textRectHeight = currRowHeight - 3;
+                textRectHeight = currRowHeight - bottomOffset;
             }
 
             QRectF rect(textRectPosX, textRectPosY, textRectWidth, textRectHeight);
             painter->drawText(rect, Qt::AlignBottom, date);
         }
     }else{
         double textRectHeight = fm.height() + 2;
-        double textRectPosY = rowPosY + m_rowHeight - (textRectHeight+3);
+        double textRectPosY = rowPosY + m_rowHeight - (textRectHeight + bottomOffset);
         QRectF rect(QPoint(textRectPosX, textRectPosY), QSize(textRectWidth, textRectHeight));
         painter->drawText(rect, Qt::AlignBottom, date);
     }