From 439f5acba8bfd6fb485c6f8d1a8d3ca46ade2b78 Mon Sep 17 00:00:00 2001 From: srazi Date: Thu, 22 Dec 2016 15:17:29 +0330 Subject: [PATCH] Bumped up version to 3.0.0 --- README.md | 4 ++-- src/progressmanager/progressview.cpp | 5 +++++ src/version.h | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 071d9f9..8803ae4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Saaghar, a Persian poetry software ---------------------------------------------------------------------------------------- -**Copyright (C) 2010-2015, Razi Alavizadeh** +**Copyright (C) 2010-2016, Razi Alavizadeh** Homepage (in English): [http://en.saaghar.pozh.org](http://en.saaghar.pozh.org) @@ -59,7 +59,7 @@ Compiling Current version ---------------------------------------------------------------------------------------- -The current version of Saaghar is **2.5.0**. You can download precompiled packages +The current version of Saaghar is **3.0.0**. You can download precompiled packages and the sources from: [Saaghar's download page](http://pozh.org/saaghar/download). Development Version diff --git a/src/progressmanager/progressview.cpp b/src/progressmanager/progressview.cpp index 0136088..876697a 100644 --- a/src/progressmanager/progressview.cpp +++ b/src/progressmanager/progressview.cpp @@ -78,7 +78,12 @@ ProgressView::ProgressView(QWidget* parent) m_layout->setSpacing(0); m_layout->setSizeConstraint(QLayout::SetFixedSize); setWindowTitle(tr("Processes")); + +#ifdef Q_OS_WIN setWindowFlags(Qt::SubWindow | Qt::Tool | Qt::CustomizeWindowHint | Qt::FramelessWindowHint); +#else + setWindowFlags(Qt::SubWindow | Qt::Tool | Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); +#endif setWindowOpacity(0.75); } diff --git a/src/version.h b/src/version.h index 4d5c4f3..d401abb 100644 --- a/src/version.h +++ b/src/version.h @@ -22,11 +22,11 @@ #ifndef VERSION_H #define VERSION_H -#define MAJOR_VERSION 2 -#define MINOR_VERSION 5 -#define PATCH_VERSION 99 +#define MAJOR_VERSION 3 +#define MINOR_VERSION 0 +#define PATCH_VERSION 0 -const QString BUILD_TIME = __DATE__" "__TIME__; +const QString BUILD_TIME = __DATE__ " " __TIME__; const QString SAAGHAR_VERSION = QString("%1.%2.%3").arg(MAJOR_VERSION).arg(MINOR_VERSION).arg(PATCH_VERSION); #define CONCAT(...) __VA_ARGS__ @@ -45,7 +45,7 @@ const QString SAAGHAR_VERSION = QString("%1.%2.%3").arg(MAJOR_VERSION).arg(MINOR #define VER_COMPANYNAME_STR "Pozh" #define VER_FILEDESCRIPTION_STR "Saaghar, a Persian Poetry Software" #define VER_INTERNALNAME_STR "Saaghar" -#define VER_LEGALCOPYRIGHT_STR "Copyright © 2010-2016, S. Razi Alavizadeh" +#define VER_LEGALCOPYRIGHT_STR "Copyright (c) 2010-2017, S. Razi Alavizadeh" #define VER_LEGALTRADEMARKS1_STR "This program is licensed under GPL v.3" #define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR #define VER_ORIGINALFILENAME_STR "Saaghar.exe"