medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[app] Allow to fix orientation

Browse source
This commit is contained in:
Slava Monich 2016-10-07 19:40:18 +03:00
parent 5be7de14ba
commit d8964ee8b1
10 changed files with 225 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/qml/BooksMain.qml
View file

@ -35,8 +35,16 @@ import harbour.books 1.0
ApplicationWindow { ApplicationWindow {
id: window id: window
allowedOrientations: Orientation.All allowedOrientations: {
switch (globalSettings.orientation) {
default:
case BooksSettings.OrientationAny: return Orientation.All
case BooksSettings.OrientationPortrait: return Orientation.Portrait
case BooksSettings.OrientationLandscape: return Orientation.Landscape
}
}
// Application title
//% "Books" //% "Books"
readonly property string title: qsTrId("harbour-books-app-name") readonly property string title: qsTrId("harbour-books-app-name")

6
app/qml/BooksStorageView.qml
View file

@ -104,7 +104,11 @@ SilicaFlickable {
console.log(_settingsComponent.errorString()) console.log(_settingsComponent.errorString())
} }
} }
pageStack.push(_settingsComponent, {"title" : text }) pageStack.push(_settingsComponent, {
"title" : text,
"allowedOrientations": window.allowedOrientations,
"followOrientationChanges": true
})
} }
} }
MenuItem { MenuItem {

72
app/settings/BooksSettings.qml
View file

@ -35,6 +35,7 @@ import org.nemomobile.configuration 1.0
Page { Page {
id: page id: page
property bool followOrientationChanges
property alias title: pageHeader.title property alias title: pageHeader.title
readonly property string rootPath: "/apps/" + appName() + "/" readonly property string rootPath: "/apps/" + appName() + "/"
@ -43,13 +44,24 @@ Page {
var parts = Qt.resolvedUrl("dummy").split('/') var parts = Qt.resolvedUrl("dummy").split('/')
if (parts.length > 2) { if (parts.length > 2) {
var name = parts[parts.length-3] var name = parts[parts.length-3]
if (name.indexOf("swissclock") >= 0) { if (name.indexOf("-books") >= 0) {
return name return name
} }
} }
return "harbour-books" return "harbour-books"
} }
Loader {
active: followOrientationChanges
Connections {
target: orientation
onValueChanged: allowedOrientations =
(orientation.value === 1) ? Orientation.Portrait :
(orientation.value === 2) ? Orientation.Landscape :
Orientation.All
}
}
SilicaFlickable { SilicaFlickable {
anchors.fill: parent anchors.fill: parent
contentHeight: content.height contentHeight: content.height
@ -89,6 +101,64 @@ Page {
onValueChanged: fontSizeSlider.value = value onValueChanged: fontSizeSlider.value = value
} }
} }
ComboBox {
id: orientationComboBox
//: Combo box label
//% "Orientation"
label: qsTrId("harbour-books-settings-page-orientation_label")
value: currentItem ? currentItem.text : ""
property bool ready
menu: ContextMenu {
id: orientationMenu
readonly property int defaultIndex: 0
MenuItem {
//: Combo box value for dynamic orientation
//% "Dynamic"
text: qsTrId("harbour-books-settings-page-orientation-dynamic")
readonly property int value: 0
}
MenuItem {
//: Combo box value for portrait orientation
//% "Portrait"
text: qsTrId("harbour-books-settings-page-orientation-portrait")
readonly property int value: 1
}
MenuItem {
//: Combo box value for landscape orientation
//% "Landscape"
text: qsTrId("harbour-books-settings-page-orientation-landscape")
readonly property int value: 2
}
}
onCurrentItemChanged: {
if (ready && currentItem) {
orientation.value = currentItem.value
}
}
Component.onCompleted: {
orientation.updateControls()
ready = true
}
ConfigurationValue {
id: orientation
key: rootPath + "orientation"
defaultValue: 0
onValueChanged: updateControls()
function updateControls() {
var n = orientationMenu.children.length
var index = orientationMenu.defaultIndex
for (var i=0; i<n; i++) {
if (orientationMenu.children[i].value === value) {
index = i
break
}
}
orientationComboBox.currentIndex = index
}
}
}
} }
} }
} }

20
app/src/BooksSettings.cpp
View file

@ -47,11 +47,13 @@
#define KEY_CURRENT_BOOK "currentBook" #define KEY_CURRENT_BOOK "currentBook"
#define KEY_CURRENT_FOLDER "currentFolder" #define KEY_CURRENT_FOLDER "currentFolder"
#define KEY_INVERT_COLORS "invertColors" #define KEY_INVERT_COLORS "invertColors"
#define KEY_ORIENTATION "orientation"
#define DEFAULT_FONT_SIZE 0 #define DEFAULT_FONT_SIZE 0
#define DEFAULT_PAGE_DETAILS 0 #define DEFAULT_PAGE_DETAILS 0
#define DEFAULT_CURRENT_BOOK QString() #define DEFAULT_CURRENT_BOOK QString()
#define DEFAULT_CURRENT_FOLDER QString() #define DEFAULT_CURRENT_FOLDER QString()
#define DEFAULT_INVERT_COLORS false #define DEFAULT_INVERT_COLORS false
#define DEFAULT_ORIENTATION (BooksSettings::OrientationAny)
#define PAGETOOL_COLOR QColor(128,128,128) // any bg #define PAGETOOL_COLOR QColor(128,128,128) // any bg
#define NORMAL_PAGETOOL_HIGHLIGHT_COLOR QColor(64,64,64) // on white #define NORMAL_PAGETOOL_HIGHLIGHT_COLOR QColor(64,64,64) // on white
@ -204,6 +206,7 @@ BooksSettings::BooksSettings(QObject* aParent) :
iInvertColorsConf(new MGConfItem(DCONF_PATH KEY_INVERT_COLORS, this)), iInvertColorsConf(new MGConfItem(DCONF_PATH KEY_INVERT_COLORS, this)),
iCurrentFolderConf(new MGConfItem(DCONF_PATH KEY_CURRENT_FOLDER, this)), iCurrentFolderConf(new MGConfItem(DCONF_PATH KEY_CURRENT_FOLDER, this)),
iCurrentBookPathConf(new MGConfItem(DCONF_PATH KEY_CURRENT_BOOK, this)), iCurrentBookPathConf(new MGConfItem(DCONF_PATH KEY_CURRENT_BOOK, this)),
iOrientationConf(new MGConfItem(DCONF_PATH KEY_ORIENTATION, this)),
iCurrentBook(NULL), iCurrentBook(NULL),
iFontSize(currentFontSize()) iFontSize(currentFontSize())
{ {
@ -214,6 +217,7 @@ BooksSettings::BooksSettings(QObject* aParent) :
connect(iInvertColorsConf, SIGNAL(valueChanged()), SIGNAL(invertColorsChanged())); connect(iInvertColorsConf, SIGNAL(valueChanged()), SIGNAL(invertColorsChanged()));
connect(iCurrentFolderConf, SIGNAL(valueChanged()), SLOT(onCurrentFolderChanged())); connect(iCurrentFolderConf, SIGNAL(valueChanged()), SLOT(onCurrentFolderChanged()));
connect(iCurrentBookPathConf, SIGNAL(valueChanged()), SLOT(onCurrentBookPathChanged())); connect(iCurrentBookPathConf, SIGNAL(valueChanged()), SLOT(onCurrentBookPathChanged()));
connect(iOrientationConf, SIGNAL(valueChanged()), SIGNAL(orientationChanged()));
} }
bool bool
@ -453,3 +457,19 @@ BooksSettings::highlightPageToolColor() const
INVERTED_PAGETOOL_HIGHLIGHT_COLOR : INVERTED_PAGETOOL_HIGHLIGHT_COLOR :
NORMAL_PAGETOOL_HIGHLIGHT_COLOR; NORMAL_PAGETOOL_HIGHLIGHT_COLOR;
} }
BooksSettings::Orientation
BooksSettings::orientation() const
{
// Need to cast int to enum right away to force "enumeration value not
// handled in switch" warning if we miss one of the Orientation:
Orientation value = (Orientation)
iOrientationConf->value(DEFAULT_ORIENTATION).toInt();
switch (value) {
case OrientationAny:
case OrientationPortrait:
case OrientationLandscape:
return value;
}
return DEFAULT_ORIENTATION;
}

21
app/src/BooksSettings.h
View file

@ -45,6 +45,7 @@ class BooksSettings : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_ENUMS(FontSize) Q_ENUMS(FontSize)
Q_ENUMS(Orientation)
Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged) Q_PROPERTY(int fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged)
Q_PROPERTY(int pageDetails READ pageDetails WRITE setPageDetails NOTIFY pageDetailsChanged) Q_PROPERTY(int pageDetails READ pageDetails WRITE setPageDetails NOTIFY pageDetailsChanged)
Q_PROPERTY(bool invertColors READ invertColors WRITE setInvertColors NOTIFY invertColorsChanged) Q_PROPERTY(bool invertColors READ invertColors WRITE setInvertColors NOTIFY invertColorsChanged)
@ -54,6 +55,7 @@ class BooksSettings : public QObject
Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged) Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged)
Q_PROPERTY(QColor primaryPageToolColor READ primaryPageToolColor CONSTANT) Q_PROPERTY(QColor primaryPageToolColor READ primaryPageToolColor CONSTANT)
Q_PROPERTY(QColor highlightPageToolColor READ highlightPageToolColor NOTIFY invertColorsChanged) Q_PROPERTY(QColor highlightPageToolColor READ highlightPageToolColor NOTIFY invertColorsChanged)
Q_PROPERTY(int orientation READ orientation NOTIFY orientationChanged)
class TextStyle; class TextStyle;
public: public:
@ -64,12 +66,18 @@ public:
FontSizeSteps = MaxFontSize - MinFontSize FontSizeSteps = MaxFontSize - MinFontSize
}; };
enum Orientation {
OrientationAny,
OrientationPortrait,
OrientationLandscape
};
explicit BooksSettings(QObject* aParent = NULL); explicit BooksSettings(QObject* aParent = NULL);
Q_INVOKABLE bool increaseFontSize(); Q_INVOKABLE bool increaseFontSize();
Q_INVOKABLE bool decreaseFontSize(); Q_INVOKABLE bool decreaseFontSize();
int fontSize() const { return iFontSize; } int fontSize() const;
void setFontSize(int aValue); void setFontSize(int aValue);
int pageDetails() const; int pageDetails() const;
@ -87,10 +95,12 @@ public:
QString currentFolder() const; QString currentFolder() const;
void setCurrentFolder(QString aValue); void setCurrentFolder(QString aValue);
QString currentStorage() const { return iCurrentStorageDevice; } QString currentStorage() const;
QColor primaryPageToolColor() const; QColor primaryPageToolColor() const;
QColor highlightPageToolColor() const; QColor highlightPageToolColor() const;
Orientation orientation() const;
Q_SIGNALS: Q_SIGNALS:
void fontSizeChanged(); void fontSizeChanged();
void textStyleChanged(); void textStyleChanged();
@ -100,6 +110,7 @@ Q_SIGNALS:
void currentFolderChanged(); void currentFolderChanged();
void currentStorageChanged(); void currentStorageChanged();
void relativePathChanged(); void relativePathChanged();
void orientationChanged();
private Q_SLOTS: private Q_SLOTS:
void onFontSizeValueChanged(); void onFontSizeValueChanged();
@ -119,6 +130,7 @@ private:
MGConfItem* iInvertColorsConf; MGConfItem* iInvertColorsConf;
MGConfItem* iCurrentFolderConf; MGConfItem* iCurrentFolderConf;
MGConfItem* iCurrentBookPathConf; MGConfItem* iCurrentBookPathConf;
MGConfItem* iOrientationConf;
mutable shared_ptr<ZLTextStyle> iTextStyle[FontSizeSteps+1]; mutable shared_ptr<ZLTextStyle> iTextStyle[FontSizeSteps+1];
BooksBook* iCurrentBook; BooksBook* iCurrentBook;
QString iCurrentStorageDevice; QString iCurrentStorageDevice;
@ -127,4 +139,9 @@ private:
QML_DECLARE_TYPE(BooksSettings) QML_DECLARE_TYPE(BooksSettings)
inline int BooksSettings::fontSize() const
{ return iFontSize; }
inline QString BooksSettings::currentStorage() const
{ return iCurrentStorageDevice; }
#endif // BOOKS_SETTINGS_H #endif // BOOKS_SETTINGS_H

22
app/translations/harbour-books-de.ts
View file

@ -65,7 +65,7 @@
<message id="harbour-books-storage-menu-settings"> <message id="harbour-books-storage-menu-settings">
<source>Settings</source> <source>Settings</source>
<extracomment>Pulley menu item</extracomment> <extracomment>Pulley menu item</extracomment>
<translation type="unfinished">Einstellungen</translation> <translation>Einstellungen</translation>
</message> </message>
<message id="harbour-books-storage-menu-scan_downloads"> <message id="harbour-books-storage-menu-scan_downloads">
<source>Scan downloads</source> <source>Scan downloads</source>
@ -114,5 +114,25 @@
<extracomment>Slider value label for the standard font size</extracomment> <extracomment>Slider value label for the standard font size</extracomment>
<translation>Standard</translation> <translation>Standard</translation>
</message> </message>
<message id="harbour-books-settings-page-orientation_label">
<source>Orientation</source>
<extracomment>Combo box label</extracomment>
<translation>Orientierung</translation>
</message>
<message id="harbour-books-settings-page-orientation-dynamic">
<source>Dynamic</source>
<extracomment>Combo box value for dynamic orientation</extracomment>
<translation>Dynamisch</translation>
</message>
<message id="harbour-books-settings-page-orientation-portrait">
<source>Portrait</source>
<extracomment>Combo box value for portrait orientation</extracomment>
<translation>Hochformat</translation>
</message>
<message id="harbour-books-settings-page-orientation-landscape">
<source>Landscape</source>
<extracomment>Combo box value for landscape orientation</extracomment>
<translation>Querformat</translation>
</message>
</context> </context>
</TS> </TS>

20
app/translations/harbour-books-fi.ts
View file

@ -114,5 +114,25 @@
<extracomment>Slider value label for the standard font size</extracomment> <extracomment>Slider value label for the standard font size</extracomment>
<translation type="unfinished">Oletus</translation> <translation type="unfinished">Oletus</translation>
</message> </message>
<message id="harbour-books-settings-page-orientation_label">
<source>Orientation</source>
<extracomment>Combo box label</extracomment>
<translation>Suunta</translation>
</message>
<message id="harbour-books-settings-page-orientation-dynamic">
<source>Dynamic</source>
<extracomment>Combo box value for dynamic orientation</extracomment>
<translation>Dynaaminen</translation>
</message>
<message id="harbour-books-settings-page-orientation-portrait">
<source>Portrait</source>
<extracomment>Combo box value for portrait orientation</extracomment>
<translation>Pysty</translation>
</message>
<message id="harbour-books-settings-page-orientation-landscape">
<source>Landscape</source>
<extracomment>Combo box value for landscape orientation</extracomment>
<translation>Vaaka</translation>
</message>
</context> </context>
</TS> </TS>

20
app/translations/harbour-books-ru.ts
View file

@ -116,5 +116,25 @@
<extracomment>Slider value label for the standard font size</extracomment> <extracomment>Slider value label for the standard font size</extracomment>
<translation>Стандартный</translation> <translation>Стандартный</translation>
</message> </message>
<message id="harbour-books-settings-page-orientation_label">
<source>Orientation</source>
<extracomment>Combo box label</extracomment>
<translation>Ориентация</translation>
</message>
<message id="harbour-books-settings-page-orientation-dynamic">
<source>Dynamic</source>
<extracomment>Combo box value for dynamic orientation</extracomment>
<translation>Динамическая</translation>
</message>
<message id="harbour-books-settings-page-orientation-portrait">
<source>Portrait</source>
<extracomment>Combo box value for portrait orientation</extracomment>
<translation>Портретная</translation>
</message>
<message id="harbour-books-settings-page-orientation-landscape">
<source>Landscape</source>
<extracomment>Combo box value for landscape orientation</extracomment>
<translation>Альбомная</translation>
</message>
</context> </context>
</TS> </TS>

20
app/translations/harbour-books-sv.ts
View file

@ -114,5 +114,25 @@
<extracomment>Slider value label for the standard font size</extracomment> <extracomment>Slider value label for the standard font size</extracomment>
<translation type="unfinished">Standard</translation> <translation type="unfinished">Standard</translation>
</message> </message>
<message id="harbour-books-settings-page-orientation_label">
<source>Orientation</source>
<extracomment>Combo box label</extracomment>
<translation>Orientering</translation>
</message>
<message id="harbour-books-settings-page-orientation-dynamic">
<source>Dynamic</source>
<extracomment>Combo box value for dynamic orientation</extracomment>
<translation>Dynamisk</translation>
</message>
<message id="harbour-books-settings-page-orientation-portrait">
<source>Portrait</source>
<extracomment>Combo box value for portrait orientation</extracomment>
<translation>Stående</translation>
</message>
<message id="harbour-books-settings-page-orientation-landscape">
<source>Landscape</source>
<extracomment>Combo box value for landscape orientation</extracomment>
<translation>Liggande</translation>
</message>
</context> </context>
</TS> </TS>

20
app/translations/harbour-books.ts
View file

@ -114,5 +114,25 @@
<extracomment>Slider value label for the standard font size</extracomment> <extracomment>Slider value label for the standard font size</extracomment>
<translation>Default</translation> <translation>Default</translation>
</message> </message>
<message id="harbour-books-settings-page-orientation_label">
<source>Orientation</source>
<extracomment>Combo box label</extracomment>
<translation>Orientation</translation>
</message>
<message id="harbour-books-settings-page-orientation-dynamic">
<source>Dynamic</source>
<extracomment>Combo box value for dynamic orientation</extracomment>
<translation>Dynamic</translation>
</message>
<message id="harbour-books-settings-page-orientation-portrait">
<source>Portrait</source>
<extracomment>Combo box value for portrait orientation</extracomment>
<translation>Portrait</translation>
</message>
<message id="harbour-books-settings-page-orientation-landscape">
<source>Landscape</source>
<extracomment>Combo box value for landscape orientation</extracomment>
<translation>Landscape</translation>
</message>
</context> </context>
</TS> </TS>