From b977233e54674ad18c638222c31a0eaff62e7841 Mon Sep 17 00:00:00 2001 From: Nutty Artist Date: Tue, 3 May 2016 20:16:43 +0300 Subject: [PATCH 1/5] Make Windows 32bit and 64bit installers in one binary, closes #14 --- packaging/windows/Notes_Inno_Script.iss | 48 +++++++++++++++++-------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/packaging/windows/Notes_Inno_Script.iss b/packaging/windows/Notes_Inno_Script.iss index 15f0df3f..2fe70eb3 100644 --- a/packaging/windows/Notes_Inno_Script.iss +++ b/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" From f611f007d56bec09beb1900c8ee36cca9e48d461 Mon Sep 17 00:00:00 2001 From: Nutty Artist Date: Sat, 7 May 2016 19:18:08 +0300 Subject: [PATCH 2/5] Fix NoteView fonts on Windows --- src/notewidgetdelegate.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/notewidgetdelegate.cpp b/src/notewidgetdelegate.cpp index 8e1e5248..e0018cef 100644 --- a/src/notewidgetdelegate.cpp +++ b/src/notewidgetdelegate.cpp @@ -27,6 +27,9 @@ NoteWidgetDelegate::NoteWidgetDelegate(QObject *parent) #ifdef __APPLE__ m_titleFont.setPointSize(13); m_dateFont.setPointSize(10); +#elif _WIN32 + m_titleFont = QFont(QStringLiteral("Arial"), 10, QFont::Bold); + m_dateFont = QFont(QStringLiteral("Arial"), 8); #endif m_timeLine = new QTimeLine(300, this); From f767c751f4ff94521d21c810eee4d257c2f8b2e8 Mon Sep 17 00:00:00 2001 From: Nutty Artist Date: Sat, 7 May 2016 19:58:48 +0300 Subject: [PATCH 3/5] Fix NoteView fonts on Mac --- src/notewidgetdelegate.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/notewidgetdelegate.cpp b/src/notewidgetdelegate.cpp index e0018cef..aa5605b0 100644 --- a/src/notewidgetdelegate.cpp +++ b/src/notewidgetdelegate.cpp @@ -25,8 +25,10 @@ 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); From 183b2279c7bc901244e99919a7dc1c22e4bfdf7f Mon Sep 17 00:00:00 2001 From: Ali Diouri Date: Sat, 7 May 2016 18:54:06 +0100 Subject: [PATCH 4/5] Setting bottomOffset value of the dateTime Rect for MacOS --- src/notewidgetdelegate.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/notewidgetdelegate.cpp b/src/notewidgetdelegate.cpp index aa5605b0..15fac8c3 100644 --- a/src/notewidgetdelegate.cpp +++ b/src/notewidgetdelegate.cpp @@ -216,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){ @@ -226,11 +231,11 @@ 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); @@ -238,7 +243,7 @@ void NoteWidgetDelegate::paintDateTime(QPainter *painter, const QStyleOptionView } }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); } From 2c34c2c5c2fbd063e29febe762c0155f78b4031d Mon Sep 17 00:00:00 2001 From: Nutty Artist Date: Sun, 8 May 2016 00:10:36 +0300 Subject: [PATCH 5/5] Update debian packaging files --- packaging/linux/deb/notes-0.8.0/src/.gitgnore | 2 -- packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/COPYING | 0 .../linux/deb/{notes-0.8.0 => notes-0.9.0}/Notes.desktop | 2 +- packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/Notes.pro | 0 .../linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/changelog | 6 ++++++ .../linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/compat | 0 .../linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/control | 4 ++-- .../linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/copyright | 0 .../linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/dirs | 0 .../deb/{notes-0.8.0 => notes-0.9.0}/debian/notes.install | 0 .../linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/rules | 0 .../deb/{notes-0.8.0 => notes-0.9.0}/debian/source/format | 0 12 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 packaging/linux/deb/notes-0.8.0/src/.gitgnore rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/COPYING (100%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/Notes.desktop (94%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/Notes.pro (100%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/changelog (50%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/compat (100%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/control (71%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/copyright (100%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/dirs (100%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/notes.install (100%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/rules (100%) rename packaging/linux/deb/{notes-0.8.0 => notes-0.9.0}/debian/source/format (100%) diff --git a/packaging/linux/deb/notes-0.8.0/src/.gitgnore b/packaging/linux/deb/notes-0.8.0/src/.gitgnore deleted file mode 100644 index d6b7ef32..00000000 --- a/packaging/linux/deb/notes-0.8.0/src/.gitgnore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/packaging/linux/deb/notes-0.8.0/COPYING b/packaging/linux/deb/notes-0.9.0/COPYING similarity index 100% rename from packaging/linux/deb/notes-0.8.0/COPYING rename to packaging/linux/deb/notes-0.9.0/COPYING diff --git a/packaging/linux/deb/notes-0.8.0/Notes.desktop b/packaging/linux/deb/notes-0.9.0/Notes.desktop similarity index 94% rename from packaging/linux/deb/notes-0.8.0/Notes.desktop rename to packaging/linux/deb/notes-0.9.0/Notes.desktop index d98de78a..e28d79af 100644 --- a/packaging/linux/deb/notes-0.8.0/Notes.desktop +++ b/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 diff --git a/packaging/linux/deb/notes-0.8.0/Notes.pro b/packaging/linux/deb/notes-0.9.0/Notes.pro similarity index 100% rename from packaging/linux/deb/notes-0.8.0/Notes.pro rename to packaging/linux/deb/notes-0.9.0/Notes.pro diff --git a/packaging/linux/deb/notes-0.8.0/debian/changelog b/packaging/linux/deb/notes-0.9.0/debian/changelog similarity index 50% rename from packaging/linux/deb/notes-0.8.0/debian/changelog rename to packaging/linux/deb/notes-0.9.0/debian/changelog index 8a6997bb..536e56b8 100644 --- a/packaging/linux/deb/notes-0.8.0/debian/changelog +++ b/packaging/linux/deb/notes-0.9.0/debian/changelog @@ -1,3 +1,9 @@ +notes (0.9.0) stable; urgency=low + + * Second release + + -- Nutty Artist > Tue, 3 May 2016 01:00:00 +0100 + notes (0.8.0) stable; urgency=low * Initial release diff --git a/packaging/linux/deb/notes-0.8.0/debian/compat b/packaging/linux/deb/notes-0.9.0/debian/compat similarity index 100% rename from packaging/linux/deb/notes-0.8.0/debian/compat rename to packaging/linux/deb/notes-0.9.0/debian/compat diff --git a/packaging/linux/deb/notes-0.8.0/debian/control b/packaging/linux/deb/notes-0.9.0/debian/control similarity index 71% rename from packaging/linux/deb/notes-0.8.0/debian/control rename to packaging/linux/deb/notes-0.9.0/debian/control index 454be0cd..412983ea 100644 --- a/packaging/linux/deb/notes-0.8.0/debian/control +++ b/packaging/linux/deb/notes-0.9.0/debian/control @@ -2,13 +2,13 @@ source: notes Section: utils Priority: optional Maintainer: Nutty Artist -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 diff --git a/packaging/linux/deb/notes-0.8.0/debian/copyright b/packaging/linux/deb/notes-0.9.0/debian/copyright similarity index 100% rename from packaging/linux/deb/notes-0.8.0/debian/copyright rename to packaging/linux/deb/notes-0.9.0/debian/copyright diff --git a/packaging/linux/deb/notes-0.8.0/debian/dirs b/packaging/linux/deb/notes-0.9.0/debian/dirs similarity index 100% rename from packaging/linux/deb/notes-0.8.0/debian/dirs rename to packaging/linux/deb/notes-0.9.0/debian/dirs diff --git a/packaging/linux/deb/notes-0.8.0/debian/notes.install b/packaging/linux/deb/notes-0.9.0/debian/notes.install similarity index 100% rename from packaging/linux/deb/notes-0.8.0/debian/notes.install rename to packaging/linux/deb/notes-0.9.0/debian/notes.install diff --git a/packaging/linux/deb/notes-0.8.0/debian/rules b/packaging/linux/deb/notes-0.9.0/debian/rules similarity index 100% rename from packaging/linux/deb/notes-0.8.0/debian/rules rename to packaging/linux/deb/notes-0.9.0/debian/rules diff --git a/packaging/linux/deb/notes-0.8.0/debian/source/format b/packaging/linux/deb/notes-0.9.0/debian/source/format similarity index 100% rename from packaging/linux/deb/notes-0.8.0/debian/source/format rename to packaging/linux/deb/notes-0.9.0/debian/source/format