diff --git a/apps/generic/generic.pro b/apps/generic/generic.pro index 3a01b29..e2c246a 100644 --- a/apps/generic/generic.pro +++ b/apps/generic/generic.pro @@ -39,15 +39,15 @@ maemo5: { SOURCES += main.cpp \ ui/mainwindow.cpp \ ui/settingsdialog.cpp \ - ui/connectdialog.cpp \ ui/aboutdialog.cpp \ ui/authenticationdialog.cpp \ qmlapplicationviewer/qmlapplicationviewer.cpp \ + ui/connectiondialog.cpp HEADERS += ui/mainwindow.h \ ui/settingsdialog.h \ - ui/connectdialog.h \ ui/aboutdialog.h \ ui/authenticationdialog.h \ qmlapplicationviewer/qmlapplicationviewer.h \ + ui/connectiondialog.h diff --git a/apps/generic/ui/connectdialog.cpp b/apps/generic/ui/connectiondialog.cpp similarity index 96% rename from apps/generic/ui/connectdialog.cpp rename to apps/generic/ui/connectiondialog.cpp index 29e0c64..aecb145 100644 --- a/apps/generic/ui/connectdialog.cpp +++ b/apps/generic/ui/connectiondialog.cpp @@ -18,7 +18,7 @@ * * ****************************************************************************/ -#include "connectdialog.h" +#include "connectiondialog.h" #include #include @@ -33,7 +33,7 @@ #include "libkodimote/kodihostmodel.h" #include "libkodimote/kodidiscovery.h" -ConnectDialog::ConnectDialog(QWidget *parent) : +ConnectionDialog::ConnectionDialog(QWidget *parent) : QDialog(parent) { @@ -135,7 +135,7 @@ ConnectDialog::ConnectDialog(QWidget *parent) : #endif } -void ConnectDialog::accept() +void ConnectionDialog::accept() { if(m_stackedLayout->currentIndex() == 0) { KodiHost *host = Kodi::instance()->hostModel()->host(m_hostView->currentIndex().row()); @@ -153,7 +153,7 @@ void ConnectDialog::accept() QDialog::accept(); } -void ConnectDialog::showManualLayout() +void ConnectionDialog::showManualLayout() { if(m_stackedLayout->currentIndex() != 2) { m_stackedLayout->setCurrentIndex(2); @@ -169,12 +169,12 @@ void ConnectDialog::showManualLayout() enableOkButton(); } -void ConnectDialog::showHostList() +void ConnectionDialog::showHostList() { m_stackedLayout->setCurrentIndex(0); } -void ConnectDialog::enableOkButton() +void ConnectionDialog::enableOkButton() { switch(m_stackedLayout->currentIndex()) { case 0: @@ -193,7 +193,7 @@ void ConnectDialog::enableOkButton() } } -void ConnectDialog::removeHost() +void ConnectionDialog::removeHost() { Kodi::instance()->hostModel()->removeHost(m_hostView->currentIndex().row()); enableOkButton(); diff --git a/apps/generic/ui/connectdialog.h b/apps/generic/ui/connectiondialog.h similarity index 96% rename from apps/generic/ui/connectdialog.h rename to apps/generic/ui/connectiondialog.h index 220bc75..ca22f44 100644 --- a/apps/generic/ui/connectdialog.h +++ b/apps/generic/ui/connectiondialog.h @@ -29,12 +29,12 @@ class QGridLayout; class QListView; class QDialogButtonBox; -class ConnectDialog : public QDialog +class ConnectionDialog : public QDialog { Q_OBJECT public: - explicit ConnectDialog(QWidget *parent = 0); + explicit ConnectionDialog(QWidget *parent = 0); void setHostname(const QString &hostname); QString hostname(); diff --git a/apps/generic/ui/mainwindow.cpp b/apps/generic/ui/mainwindow.cpp index 7e21126..80b6c60 100644 --- a/apps/generic/ui/mainwindow.cpp +++ b/apps/generic/ui/mainwindow.cpp @@ -20,7 +20,7 @@ #include "mainwindow.h" #include "settingsdialog.h" -#include "connectdialog.h" +#include "connectiondialog.h" #include "aboutdialog.h" #include "authenticationdialog.h" @@ -81,8 +81,8 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent) : QMenuBar *menuBar = new QMenuBar(); QMenu *menu = menuBar->addMenu("Kodi"); - menu->addAction(tr("Connect..."), this, SLOT(openConnectDialog())); - menu->addAction(tr("Settings"), this, SLOT(openSettingsDialog())); + menu->addAction(tr("Connect..."), this, SLOT(openConnectionDialog())); + menu->addAction(SettingsDialog::tr("Settings"), this, SLOT(openSettingsDialog())); QAction *quitAction = menu->addAction("Quit Kodi", Kodi::instance(), SLOT(quit())); Kodi::instance()->connect(Kodi::instance(), SIGNAL(connectedChanged(bool)), quitAction, SLOT(setEnabled(bool))); @@ -101,7 +101,7 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent) : connect(Kodi::instance(), SIGNAL(authenticationRequired(QString,QString)), SLOT(authenticationRequired(QString,QString)), Qt::QueuedConnection); if(!Kodi::instance()->connecting()) { - openConnectDialog(); + openConnectionDialog(); } } @@ -134,10 +134,10 @@ void MainWindow::openSettingsDialog() settings->exec(); } -void MainWindow::openConnectDialog() +void MainWindow::openConnectionDialog() { - ConnectDialog *settings = new ConnectDialog(); - settings->exec(); + ConnectionDialog *connection = new ConnectionDialog(); + connection->exec(); } void MainWindow::openAboutDialog() diff --git a/apps/generic/ui/mainwindow.h b/apps/generic/ui/mainwindow.h index 86ede3c..15b5f6e 100644 --- a/apps/generic/ui/mainwindow.h +++ b/apps/generic/ui/mainwindow.h @@ -45,7 +45,7 @@ class MainWindow : public QMainWindow private slots: void orientationChanged(); void openSettingsDialog(); - void openConnectDialog(); + void openConnectionDialog(); void openAboutDialog(); #ifdef Q_WS_MAEMO_5 diff --git a/apps/harmattan/qml/AuthenticationSheet.qml b/apps/harmattan/qml/AuthenticationDialog.qml similarity index 98% rename from apps/harmattan/qml/AuthenticationSheet.qml rename to apps/harmattan/qml/AuthenticationDialog.qml index 86a4fdc..85834f6 100644 --- a/apps/harmattan/qml/AuthenticationSheet.qml +++ b/apps/harmattan/qml/AuthenticationDialog.qml @@ -23,7 +23,7 @@ import com.nokia.meego 1.0 import Xbmc 1.0 Sheet { - id: connectionSheet + id: authenticationDialog acceptButtonText: qsTr("OK") rejectButtonText: qsTr("Cancel") diff --git a/apps/harmattan/qml/ConnectionSheet.qml b/apps/harmattan/qml/ConnectionDialog.qml similarity index 98% rename from apps/harmattan/qml/ConnectionSheet.qml rename to apps/harmattan/qml/ConnectionDialog.qml index 78f1e8d..1a15deb 100644 --- a/apps/harmattan/qml/ConnectionSheet.qml +++ b/apps/harmattan/qml/ConnectionDialog.qml @@ -25,7 +25,7 @@ import QtMobility.connectivity 1.2 import Xbmc 1.0 Sheet { - id: connectionSheet + id: connectionDialog acceptButtonText: qsTr("Connect") rejectButtonText: qsTr("Cancel") acceptButton.enabled: itemView.currentIndex == 0 && hostList.currentIndex >= 0 || hostnameTextField.text != "" @@ -39,7 +39,7 @@ Sheet { target: xbmc onConnectedChanged: { if(connected) - connectionSheet.reject(); + connectionDialog.reject(); } } @@ -254,11 +254,11 @@ Sheet { var newIndex = xbmc.hostModel().createHost(hostnameTextField.text, hostnameTextField.text, portTextField.text, macTextField.text); xbmc.hostModel().connectToHost(newIndex); } - connectionSheet.destroy(); + connectionDialog.destroy(); } onRejected: { print("rejected"); - connectionSheet.destroy(); + connectionDialog.destroy(); } } diff --git a/apps/harmattan/qml/NoConnectionPage.qml b/apps/harmattan/qml/NoConnectionPage.qml index c1decc7..1947fd8 100644 --- a/apps/harmattan/qml/NoConnectionPage.qml +++ b/apps/harmattan/qml/NoConnectionPage.qml @@ -47,7 +47,7 @@ Page { text: qsTr("Connect...") anchors.horizontalCenter: parent.horizontalCenter onClicked: { - var component = Qt.createComponent("ConnectionSheet.qml") + var component = Qt.createComponent("ConnectionDialog.qml") if (component.status === Component.Ready) { component.createObject(mainPage).open() } else { diff --git a/apps/harmattan/qml/SettingsSheet.qml b/apps/harmattan/qml/SettingsDialog.qml similarity index 99% rename from apps/harmattan/qml/SettingsSheet.qml rename to apps/harmattan/qml/SettingsDialog.qml index 663e4bb..75df43d 100644 --- a/apps/harmattan/qml/SettingsSheet.qml +++ b/apps/harmattan/qml/SettingsDialog.qml @@ -22,7 +22,7 @@ import QtQuick 1.1 import com.nokia.meego 1.0 Sheet { - id: connectionSheet + id: settingsDialog acceptButtonText: qsTr("Save") rejectButtonText: qsTr("Cancel") diff --git a/apps/harmattan/qml/main.qml b/apps/harmattan/qml/main.qml index 39a740c..59ce159 100644 --- a/apps/harmattan/qml/main.qml +++ b/apps/harmattan/qml/main.qml @@ -35,7 +35,7 @@ PageStackWindow { print("connecting", xbmc.connecting, "connected", xbmc.connected) if(!(xbmc.connecting || xbmc.connected)) { - var component = Qt.createComponent("ConnectionSheet.qml") + var component = Qt.createComponent("ConnectionDialog.qml") if (component.status == Component.Ready) { component.createObject(mainPage).open() } else { @@ -98,7 +98,7 @@ PageStackWindow { MenuItem { text: qsTr("Connect...") onClicked: { - var component = Qt.createComponent("ConnectionSheet.qml") + var component = Qt.createComponent("ConnectionDialog.qml") if (component.status == Component.Ready) { component.createObject(mainPage).open() } else { @@ -129,7 +129,7 @@ PageStackWindow { text: qsTr("Settings") onClicked: { onClicked: { - var component = Qt.createComponent("SettingsSheet.qml") + var component = Qt.createComponent("SettingsDialog.qml") if (component.status == Component.Ready) { component.createObject(mainPage).open() } else { @@ -171,7 +171,7 @@ PageStackWindow { target: xbmc onAuthenticationRequired: { print("auth required"); - var component = Qt.createComponent("AuthenticationSheet.qml") + var component = Qt.createComponent("AuthenticationDialog.qml") if (component.status == Component.Ready) { var authSheet = component.createObject(mainPage); authSheet.hostname = hostname; diff --git a/apps/sailfish/qml/pages/BrowserPage.qml b/apps/sailfish/qml/pages/BrowserPage.qml index 8b3c874..f58fe58 100644 --- a/apps/sailfish/qml/pages/BrowserPage.qml +++ b/apps/sailfish/qml/pages/BrowserPage.qml @@ -86,7 +86,7 @@ Page { } MenuItem { - text: qsTr("Now playing") + text: qsTr("Now Playing") enabled: kodi.activePlayer !== null onClicked: { pageStack.push("NowPlayingPage.qml") diff --git a/apps/sailfish/qml/pages/Keypad.qml b/apps/sailfish/qml/pages/Keypad.qml index c001e00..2966030 100644 --- a/apps/sailfish/qml/pages/Keypad.qml +++ b/apps/sailfish/qml/pages/Keypad.qml @@ -84,7 +84,7 @@ Page { } MenuItem { - text: qsTr("Now playing") + text: qsTr("Now Playing") enabled: kodi.activePlayer !== null onClicked: { pageStack.replace("NowPlayingPage.qml") diff --git a/apps/sailfish/qml/pages/MainPage.qml b/apps/sailfish/qml/pages/MainPage.qml index 29e8b15..d41b513 100644 --- a/apps/sailfish/qml/pages/MainPage.qml +++ b/apps/sailfish/qml/pages/MainPage.qml @@ -111,7 +111,7 @@ Page { } MenuItem { - text: qsTr("Now playing") + text: qsTr("Now Playing") enabled: kodi.activePlayer !== null onClicked: { pageStack.push("NowPlayingPage.qml") diff --git a/apps/sailfish/qml/pages/NowPlayingPage.qml b/apps/sailfish/qml/pages/NowPlayingPage.qml index 0b8f91c..3da010f 100644 --- a/apps/sailfish/qml/pages/NowPlayingPage.qml +++ b/apps/sailfish/qml/pages/NowPlayingPage.qml @@ -71,7 +71,7 @@ Page { } MenuItem { - text: qsTr("Now playing") + text: qsTr("Now Playing") enabled: false } } diff --git a/apps/ubuntu/qml/MainPage.qml b/apps/ubuntu/qml/MainPage.qml index 21f7092..e2c6fbf 100644 --- a/apps/ubuntu/qml/MainPage.qml +++ b/apps/ubuntu/qml/MainPage.qml @@ -284,7 +284,7 @@ KodiPage { text: qsTr("Options") Layout.fillWidth: true onClicked: { - PopupUtils.open(Qt.resolvedUrl("SettingsSheet.qml"), mainPage) + PopupUtils.open(Qt.resolvedUrl("SettingsDialog.qml"), mainPage) } } BottomEdgeButton { diff --git a/apps/ubuntu/qml/SettingsSheet.qml b/apps/ubuntu/qml/SettingsDialog.qml similarity index 100% rename from apps/ubuntu/qml/SettingsSheet.qml rename to apps/ubuntu/qml/SettingsDialog.qml diff --git a/apps/ubuntu/resources.qrc b/apps/ubuntu/resources.qrc index 5dc3b73..b60398e 100644 --- a/apps/ubuntu/resources.qrc +++ b/apps/ubuntu/resources.qrc @@ -11,7 +11,7 @@ qml/NowPlayingPage.qml qml/OpenEffect.qml qml/RatingStars.qml - qml/SettingsSheet.qml + qml/SettingsDialog.qml qml/Thumbnail.qml qml/components/AboutDialog.qml qml/components/BottomEdge.qml diff --git a/i18n/kodimote_de_AT.ts b/i18n/kodimote_de_AT.ts deleted file mode 100644 index 2b53e42..0000000 --- a/i18n/kodimote_de_AT.ts +++ /dev/null @@ -1,2261 +0,0 @@ - - - AboutDialog - - - - Donate - Spenden - - - - - Flattr - Flattr - - - - - Close - Schließen - - - - About - Über - - - - Copyright - Copyright - - - - Thanks to - Danke an - - - - AddHostDialog - - - - Name - - - - - - Hostname or IP Address - - - - - - Port - - - - - - Mac Address - - - - - Volume - - - - - Control type - - - - - Custom stepping - - - - - Up or down - - - - - Custom script - - - - - Stepping - - - - - - Up command - - - - - - Down command - - - - - Albums - - - Albums - Alben - - - - Artists - - - Artists - Interpreten - - - - AudioLibrary - - - Artists - Interpreten - - - - Albums - Alben - - - - Titles - Titel - - - - Recently added - Kürzlich hinzugefügt - - - - Recently played - Kürzlich gespielt - - - - Audio Library - Musikbibliothek - - - - AudioPlaylist - - - - Now Playing - Spielt - - - - Playlist - Wiedergabeliste - - - - Play - Abspielen - - - - Remove from playlist - Aus Liste entfernen - - - - Clear playlist - Liste löschen - - - - Music - Musik - - - - AuthenticationDialog - - - Authenticate - - - - - - XBMC on %1 requires authentication: - XBMC auf %1 benötigt Anmeldedaten: - - - - - Username - - - - - - Password - - - - - Authentication - Anmeldung - - - - Username: - Benutzername: - - - - Password: - Passwort: - - - - AuthenticationSheet - - - OK - OK - - - - Cancel - Abbrechen - - - - XBMC on %1 requires authentication: - XBMC auf %1 benötigt Anmeldedaten: - - - - Username: - Benutzername: - - - - Password: - Passwort: - - - - Browser - - - Update library - - - - - Clean library - Bibliothek bereinigen - - - - BrowserPage - - - - Home - - - - - Keypad - - - - - Now playing - - - - - Show watched - - - - - Sorting - - - - - ChannelGroups - - - TV Channels - Fernsehkanäle - - - - Channels - - - TV Channels - Fernsehkanäle - - - - ConnectDialog - - - Connect to XBMC - Verbinde mit XBMC - - - - Searching for XBMC hosts. - Suche XBMC Hosts. - - - - Please enable the following options in the Services settings of XBMC: - Bitte aktivieren Sie folgende Optionen in den Dienst-Einstellungen in XBMC: - - - - Allow control of XBMC via HTTP - Steuerung über Webinterface zulassen - - - - Allow programs on other systems to control XBMC - Steuerung über entfernte Programme zulassen - - - - Announce these services to other systems via Zeroconf - Zeroconf-Veröffentlichung - - - - If you don't use Zeroconf, add a host manually. - Wenn Sie Zeroconf nicht benutzen, fügen Sie Ihren XBMC Host manuell hinzu. - - - - Host: - Rechner: - - - - HTTP Port: - HTTP Port: - - - - MAC Address (optional): - MAC Adresse (optional): - - - - Connect - Verbinden - - - - - Add Host - Hinzufügen - - - - Remove Host - Entfernen - - - - Back - Zurück - - - - ConnectionDialog - - - Add - - - - - Connect - - - - - Cancel - - - - - Searching for XBMC hosts. - - - - - Please enable the following options in the Services settings of XBMC: - - - - - Allow control of XBMC via HTTP - - - - - Allow programs on other systems to control XBMC - - - - - Announce these services to other systems via Zeroconf - - - - - If you don't use Zeroconf, add a host manually. - - - - - Add host - - - - - Edit - - - - - Save - - - - - Remove - - - - - Removing %1 - - - - - Wake up - - - - - ConnectionSheet - - - Connect - Verbinden - - - - Cancel - Abbrechen - - - - Searching for XBMC hosts. - Suche XBMC Hosts. - - - - Please enable the following options in the Services settings of XBMC: - Bitte aktivieren Sie folgende Optionen in den Dienst-Einstellungen in XBMC: - - - - Allow control of XBMC via HTTP - Steuerung über Webinterface zulassen - - - - Allow programs on other systems to control XBMC - Steuerung über entfernte Programme zulassen - - - - Announce these services to other systems via Zeroconf - Zeroconf-Veröffentlichung - - - - If you don't use Zeroconf, add a host manually. - Wenn Sie Zeroconf nicht benutzen, fügen Sie Ihren XBMC Host manuell hinzu. - - - - XBMC on %1 - XBMC auf %1 - - - - Waking up %1... - Wecke %1... - - - - Remove Host - Entfernen - - - - Add Host - Hinzufügen - - - - Host: - Rechner: - - - - HTTP Port: - HTTP Port: - - - - MAC Address for WakeOnLan (optional): - MAC Adresse (optional): - - - - Back - Zurück - - - - CoverPage - - - XBMC on - - - - - XBMC remote - - - - - Disconnected - - - - - DatePicker - - - Date - - - - - Day - - - - - Month - - - - - Year - - - - - DownloadDialog - - - Start download? - Download starten? - - - - Start downloading %1? - Download von %1 beginnen? - - - - Yes - Ja - - - - No - Nein - - - - Episodes - - - Episodes - Episoden - - - - HomeMenu - - - Music - Musik - - - - Videos - Videos - - - - Pictures - Bilder - - - - Files - Dateien - - - - Library - Bibliothek - - - - HostList - - - Add - - - - - Remove - - - - - Connect - - - - - Host: - - - - - Port: - - - - - MAC Address for WakeOnLan (optional): - MAC Adresse (optional): - - - - OK - OK - - - - Cancel - Abbrechen - - - - ItemDetails - - - - - - Rating: - Bewertung: - - - - - - - Season: - Staffel: - - - - - - - Episode: - Folge: - - - - - - - First aired: - Erstausstrahlung: - - - - - - - Genre: - Genre: - - - - - - - Year: - Jahr: - - - - - - - Director: - Regisseur: - - - - - - - Tagline: - Titelzeile: - - - - - - - MPAA: - Altersfreigabe: - - - - - - - Instrument: - Instrument: - - - - - - - Style: - Stil: - - - - - - - Mood: - Stimmung: - - - - - - - Born: - Geboren: - - - - - - - Formed: - Formiert: - - - - - - - Died: - Gestorben: - - - - - - - Disbanded: - Aufgelöst: - - - - - - - Duration: - Dauer: - - - - - - - Comment: - Kommentar: - - - - - - - Playcount: - Zähler: - - - - - - - Cast: - Besetzung: - - - - - - - Play - Abspielen - - - - - - - Add to playlist - Zur Wiedergabeliste - - - - - Download - Herunterladen - - - - Title: - - - - - Keypad - - - - - - Keypad - - - - - Media - - - - - Now playing - - - - - Pictures - - - - - LibraryView - - - Play - Abspielen - - - - Add to playlist - Zur Wiedergabeliste - - - - Rescan library - Bibliothek aktualisieren - - - - Details - Details - - - - Download - Herunterladen - - - - MainPage - - - XBMC on %1 - XBMC auf %1 - - - - - - Music - Musik - - - - - - Videos - Videos - - - - - - Pictures - Bilder - - - - - - TV Channels - TV Kanäle - - - - - - Library - Bibliothek - - - - - - Files - Dateien - - - - - - Show files - Zeige Dateien - - - - - - Show library - Zeige Bibliothek - - - - - - Rescan library - Bibliothek aktualisieren - - - - - - Clean library - Bibliothek bereinigen - - - - Browse %1 - - - - - Keypad - - - - - Now playing - - - - - Change connection... - - - - - Settings - - - - - - About - - - - - Media Browser - - - - - Options - - - - - MainWindow - - - Connect... - Verbinden... - - - - Settings - Einstellungen - - - - About - Über - - - - Incoming call - Eingehender Anruf - - - - Download started: %1 - Download begonnen: %1 - - - - Download finished: %1 - Download beendet: %1 - - - - Error downloading %1 - Fehler beim Laden von %1 - - - - MediaSelectionDialog - - - None - - - - - MeeGoHelper - - - Incoming call - Eingehender Anruf - - - - Movies - - - Movies - Filme - - - - MusicVideos - - - Music Videos - Musikvideos - - - - NfcHandler - - - - - NFC tag is not compatible with Xbmcremote. In order to use it with Xbmcremote you need to write connection information to it. - NFC Tag ist nicht mit Xbmcremote kompatibel. Um dieses Tag mit Xbmcremote zu verwenden, müsses Sie es vorher beschreiben. - - - - NFC tag is outdated. In order to use it with Xbmcremote you need to update it by rewriting connection information to it. - NFC Tag ist veraltet. Um dieses Tag weiterhin mit Xbmcremote zu verwenden, müsses Sie es erneut beschreiben. - - - - Tag written successfully. NOTE: This tag does not offer enough space to write all informations. Wake on LAN will not work with this tag. - Tag erfolgreich beschrieben. ACHTUNG: Dieses Tag bietet nicht genug Speicherplatz für alle Informationen. Wake on LAN wird nicht funktionieren. - - - - Tag written successfully. - Tag erfolgreich beschrieben. - - - - Error writing NFC tag. - Fehler beim Schreiben des NFC Tags. - - - - NoConnection - - - Please enable the following options in the Services settings of XBMC: - - - - - Allow control of XBMC via HTTP - - - - - Allow programs on other systems to control XBMC - - - - - Connect - - - - - NoConnectionPage - - - Connect... - - - - - NowPlaying - - - Year: - Jahr: - - - - Season: - Staffel: - - - - Episode: - Folge: - - - - Rating: - Bewertung: - - - - NowPlayingDetails - - - Rating: - Bewertung: - - - - Season: - Staffel: - - - - Episode: - Folge: - - - - - First aired: - Erstausstrahlung: - - - - - Genre: - Genre: - - - - - Year: - Jahr: - - - - - Director: - Regisseur: - - - - - Tagline: - Titelzeile: - - - - - MPAA: - Altersfreigabe: - - - - - Instrument: - Instrument: - - - - - Style: - Stil: - - - - - Mood: - Stimmung: - - - - - Born: - Geboren: - - - - - Formed: - Formiert: - - - - - Died: - Gestorben: - - - - - Disbanded: - Aufgelöst: - - - - - Duration: - Dauer: - - - - - Comment: - Kommentar: - - - - - Playcount: - Zähler: - - - - - Cast: - Besetzung: - - - - NowPlayingPage - - - - Select audio track - Tonspur wählen - - - - Off - Aus - - - - - Select subtitle - Untertitel wählen - - - - - - Season: - Staffel: - - - - - - Episode: - Folge: - - - - - Rating: - Bewertung: - - - - - Year: - Jahr: - - - - Cancel - Abbrechen - - - - OK - OK - - - - Media - - - - - Keypad - - - - - Now playing - - - - - Pause - - - - - - Play - Abspielen - - - - Next - - - - - Previous - - - - - Stop - - - - - Now Playing - - - - - No active playback. Please select some content from the media tab. - - - - - None - - - - - Remove from playlist - Aus Wiedergabeliste entfernen - - - - Clear playlist - Wiedergabeliste löschen - - - - Repeat - - - - - Shuffle - - - - - Subtitles - - - - - Audio track - - - - - NowPlayingView - - - Now playing: - Jetzt gespielt: - - - - Track: - Nummer: - - - - PlaylistPage - - - - Play - Abspielen - - - - - Remove from playlist - Aus Wiedergabeliste entfernen - - - - - Clear playlist - Wiedergabeliste löschen - - - - PopupDialog - - - Xbmc on %1 - - - - - Connect to... - - - - - PowerMenu - - - Power menu - - - - - Disconnect - - - - - Quit XBMC - - - - - Shutdown XBMC host - - - - - Reboot XBMC host - - - - - Suspend XBMC host - - - - - Hibernate XBMC host - - - - - Cancel - - - - - RecentItems - - - Albums - Alben - - - - Songs - Lieder - - - - Movies - Filme - - - - Episodes - Episoden - - - - Music Videos - Musikvideos - - - - Recently added - Kürzlich hinzugefügt - - - - SailfishHelper - - - Incoming call - - - - - Seasons - - - Seasons - Staffeln - - - - SettingsDialog - - - Save - - - - - Look and feel - - - - - - Use Thumbnails - Benutze Vorschaubilder - - - - - Ignore articles for sorting - Artikel für Sortierung ignorieren - - - - Used media - - - - - Music - - - - - Videos - - - - - Pictures - - - - - TV Channels - - - - - Phone calls - - - - - Change volume - - - - - Pause video - - - - - Pause music - - - - - - Show call notifications - Anrufbenachrichtigungen anzeigen - - - - Settings - Einstellungen - - - - Change volume during calls - Ändere Lautstärke bei Anruf - - - - Pause video during calls - Pausiere Video bei Anruf - - - - Pause music during calls - Pausiere Musik bei Anruf - - - - SettingsSheet - - - Save - Speichern - - - - Cancel - Abbrechen - - - - - Look and feel - Erscheinungsbild - - - - Invert theme - Thema invertieren - - - - Use Thumbnails - Vorschaubilder benutzen - - - - Keep display on when charging - Bildschirm an bei Laden - - - - - Ignore articles for sorting - Artikel für Sortierung ignorieren - - - - - Music - Musik - - - - - Videos - Videos - - - - - Pictures - Bilder - - - - TV Channels - TV Kanäle - - - - Phone calls - Anrufe - - - - Change volume - Ändere Lautstärke - - - - Pause video - Pausiere Videos - - - - Pause music - Pausiere Musik - - - - Show call notifications - Anrufbenachrichtigungen anzeigen - - - - Media browser settings - - - - - Used media - - - - - TV - - - - - Close - - - - - Shares - - - Music - - - - - Videos - Videos - - - - Music Files - Musikdateien - - - - Video Files - Videodateien - - - - Picture Files - Bilder - - - - Shares - - - - - Songs - - - Songs - Lieder - - - - TimePicker - - - Time - - - - - Hour - - - - - Minute - - - - - TvShows - - - TV Shows - TV Sendungen - - - - VideoLibrary - - - Movies - Filme - - - - TV Shows - TV Sendungen - - - - Music Videos - Musikvideos - - - - Recently added - Kürzlich hinzugefügt - - - - Video Library - Videothek - - - - VideoPlaylist - - - Now Playing - Spielt - - - - Videos - Videos - - - - WriteNfcTagSheet - - - Tap a NFC tag to write XBMC connection information to it. You can then use the tag to connect to this XBMC. - Berühren Sie ein NFC Tag um Verbindungsinformationen darauf zu speichern. Danach können Sie es zum Verbinden benutzen. - - - - Close - Schließen - - - - Cancel - Abbrechen - - - - Write NFC Tag - NFC Tag schreiben - - - - Xbmc - - - Finished downloading %1 - Download von %1 beendet - - - - Error downloading %1 - Fehler beim Laden von %1 - - - - XbmcConnection::XbmcConnectionPrivate - - - Connecting to %1... - Verbinde zu %1... - - - - The connection has been disconnected - Die Verbindung wurde unterbrochen - - - - - Connection failed: %1 - Verbindung fehlgeschlagen: %1 - - - - This version of Xbmcremote is designed to work with XBMC Frodo (v12.0). It seems you have connected to an older version of XMBC. Please upgrade XBMC in order to use Xbmcremote. - Diese Version von Xbmcremote funktioniert nur mit XBMC Frodo (v12.0). Sie haben sich mit einer älteren Version von Xbmc verbunden. Um Xbmcremote zu verwenden müssen Sie ihr Xbmc aktualisieren. - - - - Connection to %1 timed out... - Zeitüberschreitung bei Verbindung zu %1... - - - - XbmcPage - - - XBMC on %1 - - - - - Quit - - - - - Shutdown - - - - - Reboot - - - - - Suspend - - - - - Hibernate - - - - - Media - - - - - Now Playing - - - - - Keypad - - - - - main - - - Connect... - Verbinden... - - - - Quit xbmc - XBMC beenden - - - - Write NFC Tag - NFC Tag schreiben - - - - Settings - Einstellungen - - - - About - Über - - - - - - - - OK - OK - - - - - - - - - - Cancel - Abbrechen - - - - Quit - Beenden - - - - Shutdown - Herunterfahren - - - - Reboot - Neustart - - - - Suspend - Ruhezustand - - - - Hibernate - Ruhezustand - - - - Copyright - Copyright - - - - Close - Schließen - - - - Donate - Spenden - - - - Flattr - Flattr - - - - Connecting... - - - - - Select Host - - - - - Searching for XBMC hosts. - - - - - - Please enable the following options in the Services settings of XBMC: - Bitte aktivieren Sie folgende Optionen in den Dienst-Einstellungen in XBMC: - - - - - Allow control of XBMC via HTTP - - - - - - Allow programs on other systems to control XBMC - - - - - Announce these services to other systems via Zeroconf - - - - - If you don't use Zeroconf, add a host manually. - - - - - Remove - - - - - Wake up - - - - - Edit - - - - - Host settings - - - - - Name: - - - - - Hostname or IP Address: - - - - - Port: - - - - - Mac Address: - - - - - Volume - - - - - Custom Stepping - - - - - Up or down - - - - - Custom script - - - - - - Up command - - - - - - Down command - - - - - XBMC on %1 requires authentication: - - - - - Username - - - - - Password - - - - \ No newline at end of file diff --git a/libkodimote/audiolibrary.cpp b/libkodimote/audiolibrary.cpp index c2de725..c993286 100644 --- a/libkodimote/audiolibrary.cpp +++ b/libkodimote/audiolibrary.cpp @@ -34,12 +34,12 @@ AudioLibrary::AudioLibrary() : KodiLibrary(0) { setBusy(false); - LibraryItem *item = new LibraryItem(tr("Artists"), QString(), this); + LibraryItem *item = new LibraryItem(Artists::tr("Artists"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); - item = new LibraryItem(tr("Albums"), QString(), this); + item = new LibraryItem(Albums::tr("Albums"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); @@ -49,12 +49,12 @@ AudioLibrary::AudioLibrary() : item->setPlayable(false); m_list.append(item); - item = new LibraryItem(tr("Genres"), QString(), this); + item = new LibraryItem(Genres::tr("Genres"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); - item = new LibraryItem(tr("Recently added"), QString(), this); + item = new LibraryItem(RecentItems::tr("Recently added"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); diff --git a/libkodimote/channelgroups.cpp b/libkodimote/channelgroups.cpp index d50d897..262a82c 100644 --- a/libkodimote/channelgroups.cpp +++ b/libkodimote/channelgroups.cpp @@ -31,7 +31,7 @@ ChannelGroups::ChannelGroups(KodiModel *parent) : QString ChannelGroups::title() const { - return tr("TV Channels"); + return Channels::tr("TV Channels"); } void ChannelGroups::refresh() diff --git a/libkodimote/libkodimote.pro b/libkodimote/libkodimote.pro index f2d45cc..55764a6 100644 --- a/libkodimote/libkodimote.pro +++ b/libkodimote/libkodimote.pro @@ -3,6 +3,7 @@ contains(QT_VERSION, ^5\\..\\..*) { DEFINES += QT5_BUILD QT += quick qml } else { + DEFINES += QT4_BUILD QT += declarative } @@ -14,6 +15,14 @@ ubuntu { DEFINES += UBUNTU } +maemo5 { + DEFINES += MAEMO5 +} + +contains(MEEGO_EDITION,harmattan) { + DEFINES += HARMATTAN +} + TARGET = kodimote TEMPLATE = lib CONFIG += staticlib diff --git a/libkodimote/mpris2/mpriscontroller.cpp b/libkodimote/mpris2/mpriscontroller.cpp index a71c014..de771a1 100644 --- a/libkodimote/mpris2/mpriscontroller.cpp +++ b/libkodimote/mpris2/mpriscontroller.cpp @@ -21,7 +21,6 @@ #include "mpriscontroller.h" -#include #include #include "mprisapplication.h" diff --git a/libkodimote/mpris2/mpriscontroller.h b/libkodimote/mpris2/mpriscontroller.h index d7cc0c2..55b88f9 100644 --- a/libkodimote/mpris2/mpriscontroller.h +++ b/libkodimote/mpris2/mpriscontroller.h @@ -23,7 +23,6 @@ #define MPRISCONTROLLER_H #include -#include #include "../protocolhandlers/protocolmanager.h" #include "../platformhelper.h" diff --git a/libkodimote/protocolhandlers/protocolmanager.cpp b/libkodimote/protocolhandlers/protocolmanager.cpp index 2a8e445..7d29b00 100644 --- a/libkodimote/protocolhandlers/protocolmanager.cpp +++ b/libkodimote/protocolhandlers/protocolmanager.cpp @@ -21,7 +21,11 @@ #include "protocolmanager.h" +#if defined(QT5_BUILD) #include +#elif defined(QT4_BUILD) +#include +#endif #include "youtubeprotocolhandler.h" #include "nativeprotocolhandler.h" @@ -60,6 +64,10 @@ void ProtocolManager::execute(const QUrl &url) ProtocolHandler *handler = m_handlers[url.scheme()]; +#if defined(QT5_BUILD) QUrlQuery query(url); +#elif defined(QT4_BUILD) + QUrl query = url; +#endif handler->execute(url, query.hasQueryItem("queue")); } diff --git a/libkodimote/protocolhandlers/youtubeprotocolhandler.cpp b/libkodimote/protocolhandlers/youtubeprotocolhandler.cpp index 88ead82..b6e94b5 100644 --- a/libkodimote/protocolhandlers/youtubeprotocolhandler.cpp +++ b/libkodimote/protocolhandlers/youtubeprotocolhandler.cpp @@ -21,7 +21,11 @@ #include "youtubeprotocolhandler.h" +#if defined(QT5_BUILD) #include +#elif defined(QT4_BUILD) +#include +#endif #include "kodi.h" #include "videoplayer.h" #include "playlist.h" @@ -39,7 +43,11 @@ QString YoutubeProtocolHandler::scheme() const void YoutubeProtocolHandler::execute(const QUrl &uri, bool queue) { QStringList parts = uri.path().split('/'); +#if defined(QT5_BUILD) QUrlQuery query; +#elif defined(QT4_BUILD) + QUrl query; +#endif if (parts.length() == 1) { query.addQueryItem("action", "play_video"); query.addQueryItem("videoid", parts[0]); diff --git a/libkodimote/pvrmenu.cpp b/libkodimote/pvrmenu.cpp index ac3b021..c126b6f 100644 --- a/libkodimote/pvrmenu.cpp +++ b/libkodimote/pvrmenu.cpp @@ -22,6 +22,7 @@ #include "libraryitem.h" +#include "channels.h" #include "channelgroups.h" #include "recordings.h" @@ -29,12 +30,12 @@ PvrMenu::PvrMenu(KodiModel *parent) : KodiLibrary(parent) { setBusy(false); - LibraryItem *item = new LibraryItem(tr("TV Channels"), QString(), this); + LibraryItem *item = new LibraryItem(Channels::tr("TV Channels"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); - item = new LibraryItem(tr("Recordings"), QString(), this); + item = new LibraryItem(Recordings::tr("Recordings"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); diff --git a/libkodimote/recentitems.cpp b/libkodimote/recentitems.cpp index 6a150c5..54673ed 100644 --- a/libkodimote/recentitems.cpp +++ b/libkodimote/recentitems.cpp @@ -35,31 +35,31 @@ RecentItems::RecentItems(MediaFormat mediaFormat, RecentlyWhat what, KodiLibrary { setBusy(false); if (mediaFormat == MediaFormatAudio) { - LibraryItem *item = new LibraryItem(tr("Albums"), QString(), this); + LibraryItem *item = new LibraryItem(Albums::tr("Albums"), QString(), this); item->setFileType("directory"); item->setPlayable(false); item->setProperty("id", 0); m_list.append(item); - item = new LibraryItem(tr("Songs"), QString(), this); + item = new LibraryItem(Songs::tr("Songs"), QString(), this); item->setFileType("directory"); item->setPlayable(false); item->setProperty("id", 1); m_list.append(item); } else if (mediaFormat == MediaFormatVideo) { - LibraryItem *item = new LibraryItem(tr("Movies"), QString(), this); + LibraryItem *item = new LibraryItem(Movies::tr("Movies"), QString(), this); item->setFileType("directory"); item->setPlayable(false); item->setProperty("id", 2); m_list.append(item); - item = new LibraryItem(tr("Episodes"), QString(), this); + item = new LibraryItem(Episodes::tr("Episodes"), QString(), this); item->setFileType("directory"); item->setPlayable(false); item->setProperty("id", 3); m_list.append(item); - item = new LibraryItem(tr("Music Videos"), QString(), this); + item = new LibraryItem(MusicVideos::tr("Music Videos"), QString(), this); item->setFileType("directory"); item->setPlayable(false); item->setProperty("id", 4); diff --git a/libkodimote/videolibrary.cpp b/libkodimote/videolibrary.cpp index 252da09..7a0a2b2 100644 --- a/libkodimote/videolibrary.cpp +++ b/libkodimote/videolibrary.cpp @@ -33,22 +33,22 @@ VideoLibrary::VideoLibrary(KodiModel *parent) : KodiLibrary(parent) { setBusy(false); - LibraryItem *item = new LibraryItem(tr("Movies"), QString(), this); + LibraryItem *item = new LibraryItem(Movies::tr("Movies"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); - item = new LibraryItem(tr("TV Shows"), QString(), this); + item = new LibraryItem(TvShows::tr("TV Shows"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); - item = new LibraryItem(tr("Music Videos"), QString(), this); + item = new LibraryItem(MusicVideos::tr("Music Videos"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); - item = new LibraryItem(tr("Recently added"), QString(), this); + item = new LibraryItem(RecentItems::tr("Recently added"), QString(), this); item->setFileType("directory"); item->setPlayable(false); m_list.append(item); diff --git a/libkodimote/videoplaylist.cpp b/libkodimote/videoplaylist.cpp index 3da4110..211de9e 100644 --- a/libkodimote/videoplaylist.cpp +++ b/libkodimote/videoplaylist.cpp @@ -18,6 +18,7 @@ * * ****************************************************************************/ +#include "shares.h" #include "videoplaylist.h" #include "kodiconnection.h" #include "kodebug.h" @@ -163,5 +164,5 @@ PlaylistItem* VideoPlaylist::at(int index) const QString VideoPlaylist::title() const { - return tr("Now Playing") + " - " + tr("Videos"); + return tr("Now Playing") + " - " + Shares::tr("Videos"); }