pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stick to astlye, refacatoring.

Browse source
This commit is contained in:
Martin Rotter 2017-09-09 12:28:10 +02:00
parent dedf70a8a9
commit b0ff27c232
14 changed files with 423 additions and 2348 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/scripts/astyle/astyle-format-all.sh
View file

@ -28,7 +28,16 @@ if [ $# -eq 0 ]; then
fi fi
ASTYLE_CMD="astyle" ASTYLE_CMD="astyle"
ASTYLE_RC="$(dirname $0)/.astylerc"
if [[ "$(uname -o)" == "Cygwin" ]]; then
ASTYLE_RC="$(cygpath -w $(realpath $(dirname $0)))/.astylerc"
else
ASTYLE_RC="$(realpath $(dirname $0))/.astylerc"
fi
ASTYLE_RC="$(cygpath -w $(realpath $(dirname $0)))/.astylerc"
echo "ASTYLE config file: $ASTYLE_RC"
# Check all args. # Check all args.
for dir in "$@"; do for dir in "$@"; do

2001
resources/scripts/uncrustify/uncrustify.cfg
View file

File diff suppressed because it is too large Load diff

2
src/definitions/definitions.h
View file

@ -55,7 +55,7 @@
#define ID_RECYCLE_BIN -2 #define ID_RECYCLE_BIN -2
#define TRAY_ICON_BUBBLE_TIMEOUT 20000 #define TRAY_ICON_BUBBLE_TIMEOUT 20000
#define CLOSE_LOCK_TIMEOUT 500 #define CLOSE_LOCK_TIMEOUT 500
#define DOWNLOAD_TIMEOUT 5000 #define DOWNLOAD_TIMEOUT 15000
#define MESSAGES_VIEW_DEFAULT_COL 170 #define MESSAGES_VIEW_DEFAULT_COL 170
#define MESSAGES_VIEW_MINIMUM_COL 36 #define MESSAGES_VIEW_MINIMUM_COL 36
#define FEEDS_VIEW_COLUMN_COUNT 2 #define FEEDS_VIEW_COLUMN_COUNT 2

2
src/gui/settings/settingsfeedsmessages.ui
View file

@ -82,7 +82,7 @@
<number>100</number> <number>100</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>45000</number> <number>120000</number>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<number>100</number> <number>100</number>

5
src/miscellaneous/systemfactory.h
View file

@ -30,6 +30,7 @@
class UpdateUrl { class UpdateUrl {
public: public:
QString m_fileUrl; QString m_fileUrl;
QString m_name; QString m_name;
QString m_size; QString m_size;
@ -37,10 +38,12 @@ class UpdateUrl {
class UpdateInfo { class UpdateInfo {
public: public:
QString m_availableVersion; QString m_availableVersion;
QString m_changes; QString m_changes;
QList<UpdateUrl> m_urls;
QDateTime m_date; QDateTime m_date;
QList<UpdateUrl> m_urls;
}; };
Q_DECLARE_METATYPE(UpdateInfo) Q_DECLARE_METATYPE(UpdateInfo)