Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ Version counting is based on semantic versioning (Major.Feature.Patch)
* Add rescan xml functionality to the webui.
* Add more metadata fields to the detail view.

### All GUI apps
* New settings dialogs.

### All apps
* Unify comics sorting to use the string based universal number everywhere.
* Experimental support for image based comics in epub format.
Expand Down
20 changes: 10 additions & 10 deletions YACReader/options_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "theme_factory.h"
#include "theme_manager.h"
#include "yacreader_3d_flow_config_widget.h"
#include "yacreader_settings_widget.h"
#include "yacreader_spin_slider_widget.h"

#include <QCheckBox>
Expand All @@ -20,13 +21,12 @@
#include <QPushButton>
#include <QRadioButton>
#include <QSlider>
#include <QTabWidget>
#include <QVBoxLayout>

OptionsDialog::OptionsDialog(QWidget *parent)
: YACReaderOptionsDialog(parent)
{
auto tabWidget = new QTabWidget();
auto settingsWidget = new YACReaderSettingsWidget();

auto layout = new QVBoxLayout(this);

Expand Down Expand Up @@ -135,12 +135,9 @@ OptionsDialog::OptionsDialog(QWidget *parent)
layoutGeneral->addWidget(languageBox);
layoutGeneral->addWidget(displayBox);
layoutGeneral->addWidget(magnifyingGlassBox);
layoutGeneral->addWidget(slideSizeBox);
// layoutGeneral->addWidget(fitBox);
layoutGeneral->addWidget(colorBox);
layoutGeneral->addWidget(scrollBox);
layoutGeneral->addWidget(mouseModeBox);
layoutGeneral->addWidget(shortcutsBox);
layoutGeneral->addStretch();

// GENERAL END ---------------------------------------
Expand All @@ -154,6 +151,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
disableShowOnMouseOver = new QCheckBox(tr("Disable mouse over activation"));

layoutFlow->addWidget(gl);
layoutFlow->addWidget(slideSizeBox);

layoutFlow->addWidget(quickNavi);
layoutFlow->addWidget(disableShowOnMouseOver);
Expand Down Expand Up @@ -261,15 +259,17 @@ OptionsDialog::OptionsDialog(QWidget *parent)
[]() { return ThemeManager::instance().getCurrentTheme().sourceJson; },
[](const QJsonObject &json) { ThemeManager::instance().setTheme(makeTheme(json)); },
this);
pageAppearance->addSection(colorBox);

// APPEARANCE END ------------------------------------

tabWidget->addTab(pageGeneral, tr("General"));
tabWidget->addTab(pageFlow, tr("Page Flow"));
tabWidget->addTab(pageImage, tr("Image adjustment"));
tabWidget->addTab(pageAppearance, tr("Appearance"));
settingsWidget->addPage(pageGeneral, tr("General"));
settingsWidget->addPage(pageFlow, tr("Page Flow"));
settingsWidget->addPage(pageImage, tr("Image adjustment"));
settingsWidget->addPage(pageAppearance, tr("Appearance"));
settingsWidget->addPage(shortcutsPage, shortcutsPage->windowTitle());

layout->addWidget(tabWidget);
layout->addWidget(settingsWidget);

auto buttons = new QHBoxLayout();
buttons->addStretch();
Expand Down
92 changes: 51 additions & 41 deletions YACReader/yacreader_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,24 +92,24 @@
<translation>Der aktuelle Theme-JSON konnte nicht geladen werden.</translation>
</message>
<message>
<location filename="../common/themes/appearance_tab_widget.cpp" line="279"/>
<location filename="../common/themes/appearance_tab_widget.cpp" line="284"/>
<source>Import theme</source>
<translation>Thema importieren</translation>
</message>
<message>
<location filename="../common/themes/appearance_tab_widget.cpp" line="279"/>
<location filename="../common/themes/appearance_tab_widget.cpp" line="284"/>
<source>JSON files (*.json);;All files (*)</source>
<translation>JSON-Dateien (*.json);;Alle Dateien (*)</translation>
</message>
<message>
<location filename="../common/themes/appearance_tab_widget.cpp" line="287"/>
<location filename="../common/themes/appearance_tab_widget.cpp" line="292"/>
<source>Could not import theme from:
%1</source>
<translation>Theme konnte nicht importiert werden von:
%1</translation>
</message>
<message>
<location filename="../common/themes/appearance_tab_widget.cpp" line="288"/>
<location filename="../common/themes/appearance_tab_widget.cpp" line="293"/>
<source>Could not import theme from:
%1

Expand All @@ -120,7 +120,7 @@
%2</translation>
</message>
<message>
<location filename="../common/themes/appearance_tab_widget.cpp" line="289"/>
<location filename="../common/themes/appearance_tab_widget.cpp" line="294"/>
<source>Import failed</source>
<translation>Der Import ist fehlgeschlagen</translation>
</message>
Expand Down Expand Up @@ -276,12 +276,12 @@
<context>
<name>OptionsDialog</name>
<message>
<location filename="options_dialog.cpp" line="193"/>
<location filename="options_dialog.cpp" line="191"/>
<source>Gamma</source>
<translation>Gammawert</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="197"/>
<location filename="options_dialog.cpp" line="195"/>
<source>Reset</source>
<translation>Zurücksetzen</translation>
</message>
Expand All @@ -291,32 +291,32 @@
<translation>Meine Comics-Pfad</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="232"/>
<location filename="options_dialog.cpp" line="230"/>
<source>Scaling</source>
<translation>Skalierung</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="234"/>
<location filename="options_dialog.cpp" line="232"/>
<source>Scaling method</source>
<translation>Skalierungsmethode</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="236"/>
<location filename="options_dialog.cpp" line="234"/>
<source>Nearest (fast, low quality)</source>
<translation>Am nächsten (schnell, niedrige Qualität)</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="237"/>
<location filename="options_dialog.cpp" line="235"/>
<source>Bilinear</source>
<translation>Bilinear-Filter</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="238"/>
<location filename="options_dialog.cpp" line="236"/>
<source>Lanczos (better quality)</source>
<translation>Lanczos (bessere Qualität)</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="269"/>
<location filename="options_dialog.cpp" line="268"/>
<source>Image adjustment</source>
<translation>Bildanpassung</translation>
</message>
Expand All @@ -331,17 +331,17 @@
<translation>Auswählen</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="202"/>
<location filename="options_dialog.cpp" line="200"/>
<source>Image options</source>
<translation>Bilderoptionen</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="192"/>
<location filename="options_dialog.cpp" line="190"/>
<source>Contrast</source>
<translation>Kontrast</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="270"/>
<location filename="options_dialog.cpp" line="269"/>
<source>Appearance</source>
<translation>Aussehen</translation>
</message>
Expand Down Expand Up @@ -381,17 +381,17 @@
<translation>Hintergrundfarbe</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="268"/>
<location filename="options_dialog.cpp" line="267"/>
<source>Page Flow</source>
<translation>Seitenfluss</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="267"/>
<location filename="options_dialog.cpp" line="266"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="191"/>
<location filename="options_dialog.cpp" line="189"/>
<source>Brightness</source>
<translation>Helligkeit</translation>
</message>
Expand All @@ -401,7 +401,7 @@
<translation>Neustart erforderlich</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="153"/>
<location filename="options_dialog.cpp" line="150"/>
<source>Quick Navigation Mode</source>
<translation>Schnellnavigations-Modus</translation>
</message>
Expand Down Expand Up @@ -476,27 +476,27 @@
<translation>Klicken Sie auf die linke oder rechte Hälfte des Bildschirms, um die Seiten umzublättern.</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="154"/>
<location filename="options_dialog.cpp" line="151"/>
<source>Disable mouse over activation</source>
<translation>Aktivierung durch Maus deaktivieren</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="206"/>
<location filename="options_dialog.cpp" line="204"/>
<source>Fit options</source>
<translation>Anpassungsoptionen</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="208"/>
<location filename="options_dialog.cpp" line="206"/>
<source>Enlarge images to fit width/height</source>
<translation>Bilder vergrößern, um sie Breite/Höhe anzupassen</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="219"/>
<location filename="options_dialog.cpp" line="217"/>
<source>Double Page options</source>
<translation>Doppelseiten-Einstellungen</translation>
</message>
<message>
<location filename="options_dialog.cpp" line="221"/>
<location filename="options_dialog.cpp" line="219"/>
<source>Show covers as single page</source>
<translation>Cover als eine Seite darstellen</translation>
</message>
Expand Down Expand Up @@ -734,48 +734,48 @@
<context>
<name>Viewer</name>
<message>
<location filename="viewer.cpp" line="1662"/>
<location filename="viewer.cpp" line="1694"/>
<source>Page not available!</source>
<translation>Seite nicht verfügbar!</translation>
</message>
<message>
<location filename="viewer.cpp" line="63"/>
<location filename="viewer.cpp" line="1634"/>
<location filename="viewer.cpp" line="95"/>
<location filename="viewer.cpp" line="1666"/>
<source>Press &apos;O&apos; to open comic.</source>
<translation>&apos;O&apos; drücken, um Comic zu öffnen.</translation>
</message>
<message>
<location filename="viewer.cpp" line="294"/>
<location filename="viewer.cpp" line="326"/>
<source>Error opening comic</source>
<translation>Fehler beim Öffnen des Comics</translation>
</message>
<message>
<location filename="viewer.cpp" line="1885"/>
<location filename="viewer.cpp" line="1917"/>
<source>Cover!</source>
<translation>Titelseite!</translation>
</message>
<message>
<location filename="viewer.cpp" line="300"/>
<location filename="viewer.cpp" line="332"/>
<source>CRC Error</source>
<translation>CRC Fehler</translation>
</message>
<message>
<location filename="viewer.cpp" line="288"/>
<location filename="viewer.cpp" line="320"/>
<source>Comic not found</source>
<translation>Comic nicht gefunden</translation>
</message>
<message>
<location filename="viewer.cpp" line="288"/>
<location filename="viewer.cpp" line="320"/>
<source>Not found</source>
<translation>Nicht gefunden</translation>
</message>
<message>
<location filename="viewer.cpp" line="1899"/>
<location filename="viewer.cpp" line="1931"/>
<source>Last page!</source>
<translation>Letzte Seite!</translation>
</message>
<message>
<location filename="viewer.cpp" line="1651"/>
<location filename="viewer.cpp" line="1683"/>
<source>Loading...please wait!</source>
<translation>Ladevorgang... Bitte warten!</translation>
</message>
Expand Down Expand Up @@ -1443,12 +1443,12 @@
<context>
<name>YACReader::WhatsNewDialog</name>
<message>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="183"/>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="182"/>
<source>Release notes are not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="239"/>
<location filename="../custom_widgets/whats_new_dialog.cpp" line="238"/>
<source>Previous versions</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1486,22 +1486,32 @@
<context>
<name>YACReaderOptionsDialog</name>
<message>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="19"/>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="21"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
<message>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="20"/>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="22"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="25"/>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="29"/>
<source>Keyboard shortcuts</source>
<translation>Tastenkürzel</translation>
</message>
<message>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="31"/>
<source>Customize the keyboard shortcuts used by the application.</source>
<translation>Passen Sie die von der Anwendung verwendeten Tastenkürzel an.</translation>
</message>
<message>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="32"/>
<source>Edit shortcuts</source>
<translation>Kürzel bearbeiten</translation>
</message>
<message>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="28"/>
<location filename="../custom_widgets/yacreader_options_dialog.cpp" line="27"/>
<source>Shortcuts</source>
<translation>Kürzel</translation>
</message>
Expand Down
Loading
Loading