diff --git a/CHANGELOG.md b/CHANGELOG.md index 95ffa8fb..218e335a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ Version counting is based on semantic versioning (Major.Feature.Patch) +## 9.16.3 + +### YACReader +* Fix current page/time label content when the content is too long. + +### YACReaderLibrary +* Fix table view last section stretch. Before it was only working randomly. +* Fix empty table view caused by wront state being saved. You'll need to reconfigure the table view headers to your liking after this. +* Fix open comic shortcut in fullscreen mode. + ## 9.16.2 ### YACReaderLibrary diff --git a/YACReader/page_label_widget.cpp b/YACReader/page_label_widget.cpp index e0a7ee34..8fd6a4b9 100644 --- a/YACReader/page_label_widget.cpp +++ b/YACReader/page_label_widget.cpp @@ -21,7 +21,7 @@ PageLabelWidget::PageLabelWidget(QWidget *parent) textLabel = new QLabel(this); textLabel->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter); - textLabel->setWordWrap(true); // Allow wrapping + textLabel->setWordWrap(false); // Wrapping needs to be disabled, we need to show all the text in one line int contentMargin = 0; if (verticalRes <= 1024) { diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp index 82494b0e..66b602b9 100644 --- a/YACReaderLibrary/classic_comics_view.cpp +++ b/YACReaderLibrary/classic_comics_view.cpp @@ -46,8 +46,8 @@ ClassicComicsView::ClassicComicsView(QWidget *parent) stack->addWidget(searchingIcon); sVertical->addWidget(stack); - comics = new QWidget; - auto comicsLayout = new QVBoxLayout; + comics = new QWidget(this); + auto comicsLayout = new QVBoxLayout(this); comicsLayout->setSpacing(0); comicsLayout->setContentsMargins(0, 0, 0, 0); // TODO ComicsView:(set toolbar) comicsLayout->addWidget(editInfoToolBar); @@ -143,6 +143,8 @@ void ClassicComicsView::setModel(ComicModel *model) connect(model, &ComicModel::resortedIndexes, comicFlow, &ComicFlowWidget::resortCovers, Qt::UniqueConnection); connect(model, &ComicModel::newSelectedIndex, this, &ClassicComicsView::setCurrentIndex, Qt::UniqueConnection); + tableView->horizontalHeader()->blockSignals(true); + tableView->setModel(model); if (model->rowCount() > 0) tableView->setCurrentIndex(model->index(0, 0)); @@ -151,15 +153,12 @@ void ClassicComicsView::setModel(ComicModel *model) comicFlow->setImagePaths(paths); comicFlow->setMarks(model->getReadList()); - bool loadDefaults = false; + bool loadDefaults = true; if (settings->contains(COMICS_VIEW_HEADERS)) { try { loadDefaults = !tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray()); } catch (...) { - loadDefaults = true; } - } else { - loadDefaults = true; } if (loadDefaults) { @@ -190,10 +189,17 @@ void ClassicComicsView::setModel(ComicModel *model) } } - tableView->resizeColumnsToContents(); tableView->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft); tableView->horizontalHeader()->setSectionsMovable(true); tableView->horizontalHeader()->setStretchLastSection(true); + + for (int i = 0; i < tableView->horizontalHeader()->count() - 1; i++) { + if (!tableView->horizontalHeader()->isSectionHidden(i)) { + tableView->resizeColumnToContents(i); + } + } + + tableView->horizontalHeader()->blockSignals(false); } } @@ -347,6 +353,14 @@ void ClassicComicsView::updateTableView(int i) void ClassicComicsView::saveTableHeadersStatus() { + if (model == nullptr) { + return; + } + + if (model->rowCount() == 0) { + return; + } + settings->setValue(COMICS_VIEW_HEADERS, tableView->horizontalHeader()->saveState()); } diff --git a/YACReaderLibrary/library_window_actions.cpp b/YACReaderLibrary/library_window_actions.cpp index 554e5eea..ad49d1e7 100644 --- a/YACReaderLibrary/library_window_actions.cpp +++ b/YACReaderLibrary/library_window_actions.cpp @@ -441,6 +441,9 @@ void LibraryWindowActions::createActions(LibraryWindow *window, QSettings *setti addToFavoritesAction->setToolTip(tr("Add selected comics to favorites list")); addToFavoritesAction->setIcon(QIcon(":/images/lists/default_1.svg")); + // global actions + window->addAction(openComicAction); // this fixes opening comics in fullscreen mode using the keyboard shortcut + // actions not asigned to any widget window->addAction(saveCoversToAction); window->addAction(openContainingFolderAction); diff --git a/common/yacreader_global.h b/common/yacreader_global.h index 04c158f8..36b1f5d7 100644 --- a/common/yacreader_global.h +++ b/common/yacreader_global.h @@ -9,7 +9,7 @@ class QLibrary; -#define VERSION "9.16.2" +#define VERSION "9.16.3" // Used to check if the database needs to be updated, the version is stored in the database. // This value is only incremented when the database structure changes. diff --git a/common/yacreader_global_gui.h b/common/yacreader_global_gui.h index cb7397fa..a4e667e4 100644 --- a/common/yacreader_global_gui.h +++ b/common/yacreader_global_gui.h @@ -57,7 +57,7 @@ #define MAIN_WINDOW_GEOMETRY "MAIN_WINDOW_GEOMETRY" #define MAIN_WINDOW_STATE "MAIN_WINDOW_STATE" -#define COMICS_VIEW_HEADERS "COMICS_VIEW_HEADERS_NEW" // VALUE CHANGED IN 9.14 to avoid issues with previous versions +#define COMICS_VIEW_HEADERS "COMICS_VIEW_HEADERS_9.16.3" // VALUE CHANGED IN 9.16.3 to avoid issues with previous versions #define COMICS_VIEW_HEADERS_GEOMETRY "COMICS_VIEW_HEADERS_GEOMETRY" #define COMICS_VIEW_STATUS "COMICS_VIEW_STATUS" #define COMICS_VIEW_FLOW_SPLITTER_STATUS "COMICS_VIEW_FLOW_SPLITTER_STATUS" diff --git a/custom_widgets/whats_new_dialog.cpp b/custom_widgets/whats_new_dialog.cpp index d0ec925c..4f0e1dcc 100644 --- a/custom_widgets/whats_new_dialog.cpp +++ b/custom_widgets/whats_new_dialog.cpp @@ -52,6 +52,7 @@ YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent) " • Don't use scroll animations on macOS by default, where hdpi scroll is most likely to be used
" " • New toolbar on macOS
" " • New mouse modes to turn pages - you can setup the app to use the left/right buttons to turn pages directly or click on the left/right part of the screen to turn pages
" + " • Fix current page/time label content when the content is too long. (new in 9.16.3)
" "
" "YACReaderLibrary
" " • Improve flexibility of the open comic in third party app setting so more complex commands can be used, e.g. `open -a \"/Applications/My Reader.app\" \"{comic_file_path}\"`
" @@ -71,6 +72,8 @@ YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent) " • Added a customizable User Agent string to use it with Comic Vine. It can be set in YACReaderLibrary.ini in the [ComicVine] section using the COMIC_VINE_USER_AGENT key (new in 9.16.2)
" " • Prevent crash when opening the folders context menu if a folder is not selected. (new in 9.16.2)
" " • Fix crash when using the `Set type` menu on libraries. (new in 9.16.2)
" + " • Fix table view last section stretch. Before it was only working randomly. (new in 9.16.3)
" + " • Fix empty table view caused by wront state being saved. You'll need to reconfigure the table view headers to your liking after this udpate. (new in 9.16.3)
" "
" "YACReaderLibraryServer
" " • Log libraries validation when the app starts
"