You can now directly import calendar events without launching the bro…

…wser. An alternative API is now available in the settings for the case you have synchronization issues.
scharel · Apr 2, 2018 · ed0f143 · ed0f143
1 parent 0aadced
commit ed0f143
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
@@ -24,7 +24,7 @@ Page {
                 spacing: Theme.paddingMedium
                 //: App version
                 Label { text: qsTr("Versioun"); color: Theme.primaryColor }
-                Label { text: "2.3-2"; color: Theme.highlightColor }
+                Label { text: "2.3-3"; color: Theme.highlightColor }
                 Label { text: qsTr("Debug-Modus"); visible: debug; color: Theme.secondaryColor }
             }
 

diff --git a/qml/pages/EventPage.qml b/qml/pages/EventPage.qml
@@ -69,6 +69,7 @@ Page {
             Button {
                 anchors.horizontalCenter: parent.horizontalCenter
                 visible: event.ics_url.length > 0
+                enabled: !appSettings.alternativeAPI
                 //: Import the event into the calendar
                 text: qsTr("An de Kalenner importéieren")
                 DBusInterface {

diff --git a/qml/pages/EventsPage.qml b/qml/pages/EventsPage.qml
@@ -46,7 +46,7 @@ Page {
 
         header: PageHeader {
             //: Header of the events page
-            title: qsTr("Agenda")
+            title: qsTr("ACEL Agenda")
         }
 
         model: JSONListModel {

diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml
@@ -116,8 +116,8 @@ Page {
             }
 
             SectionHeader {
-                //: API (Application Programmable Interface)
-                text: qsTr("API")
+                //: AcelApi (Application Programmable Interface)
+                text: qsTr("AcelApi")
             }
             TextSwitch {
                 //: Alternative API

diff --git a/rpm/harbour-lidderbuch.changes b/rpm/harbour-lidderbuch.changes
@@ -8,6 +8,9 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes
 
+* Mon Apr 02 2018 Scharel Clemens <[email protected]> 2.3-3
+- Disable calendar import when using the alternative API
+
 * Mon Mar 26 2018 Scharel Clemens <[email protected]> 2.3-2
 - Alternative API on https://www.scharel.name/harbour/lidderbuch/
 - Fixed issue #8 about the cover action

diff --git a/rpm/harbour-lidderbuch.spec b/rpm/harbour-lidderbuch.spec
@@ -14,7 +14,7 @@ Name:       harbour-lidderbuch
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    ACEL Lidderbuch
 Version:    2.3
-Release:    2
+Release:    3
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/

diff --git a/rpm/harbour-lidderbuch.yaml b/rpm/harbour-lidderbuch.yaml
@@ -1,7 +1,7 @@
 Name: harbour-lidderbuch
 Summary: ACEL Lidderbuch
 Version: 2.3
-Release: 2
+Release: 3
 # The contents of the Group field should be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
 Group: Qt/Qt

diff --git a/translations/harbour-lidderbuch.ts b/translations/harbour-lidderbuch.ts
@@ -204,11 +204,6 @@
         <extracomment>Updated</extracomment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Agenda</source>
-        <extracomment>Header of the events page</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Näischt an der Agenda</source>
         <extracomment>No envent available</extracomment>
@@ -233,6 +228,11 @@
         <extracomment>never</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>ACEL Agenda</source>
+        <extracomment>Header of the events page</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SettingsPage</name>
@@ -330,11 +330,6 @@
         <extracomment>Section to manipulate the look of the SongPage</extracomment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>API</source>
-        <extracomment>API (Application Programmable Interface)</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Alternativ API</source>
         <extracomment>Alternative API</extracomment>
@@ -345,6 +340,11 @@
         <extracomment>Use this if you have problems with the API</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AcelApi</source>
+        <extracomment>AcelApi (Application Programmable Interface)</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongPage</name>