Skip to content

Commit 556444d

Browse files
setvisiblesetvisible
committed
Merge branch 'feature-simplify-code' into develop
2 parents cf57570 + 6e9320d commit 556444d

File tree

146 files changed

+11810
-11552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+11810
-11552
lines changed

‎3rd/yt-dlp/bin/yt-dlp

5.09 KB
Binary file not shown.

‎3rd/yt-dlp/bin/yt-dlp.exe

-279 KB
Binary file not shown.

‎3rd/yt-dlp/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.01.26
1+
2025.02.19

‎include/Core/AbstractDownloadItem

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/AbstractJob

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/abstractjob.h"

‎include/Core/DownloadEngine

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/DownloadItem

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/DownloadManager

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/DownloadStreamItem

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/DownloadTorrentItem

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/IDownloadItem

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/IFileAccessManager

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Core/IScheduler

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/ischeduler.h"

‎include/Core/JobFile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/jobfile.h"

‎include/Core/JobStream

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/jobstream.h"

‎include/Core/JobTorrent

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/jobtorrent.h"

‎include/Core/QueueModel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/queuemodel.h"

‎include/Core/Scheduler

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/scheduler.h"

‎include/Core/Snapshot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/snapshot.h"

‎include/Core/Utils

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/core/utils.h"

‎include/Widgets/DownloadQueueView

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/Widgets/QueueView

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/widgets/queueview.h"

‎include/Widgets/QueueViewItemDelegate

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "../../src/widgets/queueviewitemdelegate.h"

‎src/constants.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,19 @@ const int COLUMN_NAME_WIDTH = 200;
131131

132132
const int ELIDE_CHAR_COUNT = 30;
133133

134-
const int COL_0_FILE_NAME = 0;
135-
const int COL_1_WEBSITE_DOMAIN = 1;
136-
const int COL_2_PROGRESS_BAR = 2;
137-
const int COL_3_PERCENT = 3;
138-
const int COL_4_SIZE = 4;
139-
const int COL_5_ESTIMATED_TIME = 5;
140-
const int COL_6_SPEED = 6;
134+
const int COL_0_FILE_NAME = 0;
135+
const int COL_1_WEBSITE_DOMAIN = 1;
136+
const int COL_2_PROGRESS_BAR = 2;
137+
const int COL_3_PERCENT = 3;
138+
const int COL_4_FILE_SIZE = 4;
139+
const int COL_4_SIZE = 4; // to remove
140+
const int COL_5_ESTIMATED_TIME = 5;
141+
const int COL_6_SPEED = 6;
141142
// const int COL_7_SEGMENTS = 7; /* hidden */
142143
// const int COL_8_MASK = 8; /* hidden */
143144
// const int COL_9_SAVE_PATH = 9; /* hidden */
144145
// const int COL_10_CHECKSUM = 10; /* hidden */
146+
const int COL_COUNT = COL_6_SPEED + 1;
145147

146148
const int MAX_HISTORY_COUNT = 10;
147149

‎src/core/CMakeLists.txt

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
set(MY_SOURCES ${MY_SOURCES}
2-
${CMAKE_SOURCE_DIR}/src/core/abstractdownloaditem.cpp
2+
${CMAKE_SOURCE_DIR}/src/core/abstractjob.cpp
33
${CMAKE_SOURCE_DIR}/src/core/abstractsettings.cpp
44
${CMAKE_SOURCE_DIR}/src/core/checkabletablemodel.cpp
5-
${CMAKE_SOURCE_DIR}/src/core/downloadengine.cpp
6-
${CMAKE_SOURCE_DIR}/src/core/downloaditem.cpp
7-
${CMAKE_SOURCE_DIR}/src/core/downloadmanager.cpp
8-
${CMAKE_SOURCE_DIR}/src/core/downloadstreamitem.cpp
9-
${CMAKE_SOURCE_DIR}/src/core/downloadtorrentitem.cpp
105
${CMAKE_SOURCE_DIR}/src/core/file.cpp
116
${CMAKE_SOURCE_DIR}/src/core/fileaccessmanager.cpp
127
${CMAKE_SOURCE_DIR}/src/core/fileutils.cpp
138
${CMAKE_SOURCE_DIR}/src/core/format.cpp
149
${CMAKE_SOURCE_DIR}/src/core/htmlparser.cpp
10+
${CMAKE_SOURCE_DIR}/src/core/jobfile.cpp
11+
${CMAKE_SOURCE_DIR}/src/core/jobstream.cpp
12+
${CMAKE_SOURCE_DIR}/src/core/jobtorrent.cpp
1513
${CMAKE_SOURCE_DIR}/src/core/locale.cpp
1614
${CMAKE_SOURCE_DIR}/src/core/mask.cpp
1715
${CMAKE_SOURCE_DIR}/src/core/mimedatabase.cpp
1816
${CMAKE_SOURCE_DIR}/src/core/model.cpp
1917
${CMAKE_SOURCE_DIR}/src/core/networkmanager.cpp
18+
${CMAKE_SOURCE_DIR}/src/core/queuemodel.cpp
2019
${CMAKE_SOURCE_DIR}/src/core/regex.cpp
2120
${CMAKE_SOURCE_DIR}/src/core/resourceitem.cpp
2221
${CMAKE_SOURCE_DIR}/src/core/resourcemodel.cpp
22+
${CMAKE_SOURCE_DIR}/src/core/scheduler.cpp
2323
${CMAKE_SOURCE_DIR}/src/core/session.cpp
2424
${CMAKE_SOURCE_DIR}/src/core/settings.cpp
25+
${CMAKE_SOURCE_DIR}/src/core/snapshot.cpp
2526
${CMAKE_SOURCE_DIR}/src/core/stream.cpp
2627
${CMAKE_SOURCE_DIR}/src/core/streammanager.cpp
2728
${CMAKE_SOURCE_DIR}/src/core/theme.cpp
@@ -32,17 +33,19 @@ set(MY_SOURCES ${MY_SOURCES}
3233
${CMAKE_SOURCE_DIR}/src/core/torrentmessage.cpp
3334
${CMAKE_SOURCE_DIR}/src/core/updatechecker.cpp
3435
${CMAKE_SOURCE_DIR}/src/core/updateinstaller.cpp
36+
${CMAKE_SOURCE_DIR}/src/core/utils.cpp
3537
)
3638

3739
# Rem: set here the headers related to the Qt MOC (i.e., with associated *.ui)
3840
set(MY_HEADERS ${MY_HEADERS}
39-
${CMAKE_SOURCE_DIR}/src/core/downloaditem.h
40-
${CMAKE_SOURCE_DIR}/src/core/downloadmanager.h
41-
${CMAKE_SOURCE_DIR}/src/core/downloadstreamitem.h
42-
${CMAKE_SOURCE_DIR}/src/core/downloadtorrentitem.h
41+
${CMAKE_SOURCE_DIR}/src/core/jobfile.h
42+
${CMAKE_SOURCE_DIR}/src/core/jobstream.h
43+
${CMAKE_SOURCE_DIR}/src/core/jobtorrent.h
4344
${CMAKE_SOURCE_DIR}/src/core/model.h
4445
${CMAKE_SOURCE_DIR}/src/core/resourcemodel.h
46+
${CMAKE_SOURCE_DIR}/src/core/scheduler.h
4547
${CMAKE_SOURCE_DIR}/src/core/settings.h
48+
${CMAKE_SOURCE_DIR}/src/core/snapshot.h
4649
${CMAKE_SOURCE_DIR}/src/core/updatechecker.h
4750
${CMAKE_SOURCE_DIR}/src/core/updatechecker_p.h
4851
${CMAKE_SOURCE_DIR}/src/core/updateinstaller.h

0 commit comments

Comments
 (0)