diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..677477f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +# EditorConfig +root = true + +# elementary defaults +[*] +charset = utf-8 +end_of_line = lf +indent_size = tab +indent_style = space +insert_final_newline = true +max_line_length = 80 +tab_width = 4 + +# Markup files +[{*.html,*.xml,*.xml.in,*.yml}] +tab_width = 2 diff --git a/.gitignore b/.gitignore index 8d4c0df..621cf79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ build/ -build/* -*~ -src/config.vala -eradio.sublime-workspace \ No newline at end of file +app/ diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index d5c99b7..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,143 +0,0 @@ - -project (eradio) -cmake_minimum_required (VERSION 2.6) -list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - -set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME}) -add_definitions("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"") -add_definitions("-w") - -set (HOMEDIR $ENV{HOME}) -set (HOME_DATADIR ${HOMEDIR}/.local/share/eradio) -set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") -set (PKGDATADIR "${DATADIR}/eradio") -set (PKG_DATADIR ${PKGDATADIR}) - -set (EXEC_NAME "com.github.dreamdevel.eradio") -set (RELEASE_NAME "eRadio") -set (VERSION "2.0.1") - -set (CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/config.vala) -set (CONFIG_FILE_REL src/config.vala) -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/config.vala.cmake ${CONFIG_FILE}) - -include (GSettings) -add_schema ("schemas/com.dreamdevel.eradio.gschema.xml") - -find_package(PkgConfig) - -set (PROJECT_DEPS - gstreamer-1.0 - gtk+-3.0 - granite - sqlite3 - gee-0.8 - libnotify - json-glib-1.0 - libsoup-2.4 - libxml-2.0 - sqlheavy-0.1 -) - -pkg_check_modules(DEPS REQUIRED ${PROJECT_DEPS}) - -add_definitions(${DEPS_CFLAGS}) -link_libraries(${DEPS_LIBRARIES} m) -link_directories(${DEPS_LIBRARY_DIRS}) - -find_package(Vala REQUIRED) -include(ValaVersion) -ensure_vala_version("0.24" MINIMUM) -include(ValaPrecompile) - -vala_precompile(VALA_C ${EXEC_NAME} - ${CONFIG_FILE_REL} - src/main.vala - src/radio.vala - src/error.vala - src/package_manager.vala - - src/Enums/PlayerStatus.vala - src/Enums/ListStoreFilterType.vala - - src/Models/Genre.vala - src/Models/Station.vala - src/Models/WebRadio.vala - - src/Core/Database.vala - src/Core/Player.vala - src/Core/PlayerHelper.vala - src/Core/MPRIS.vala - src/Core/MediaKeyListener.vala - src/Core/Notifier.vala - src/Core/Settings.vala - src/Core/DatabaseModels/GenreModel.vala - src/Core/DatabaseModels/StationModel.vala - src/Core/DatabaseModels/StationsGenresModel.vala - src/Core/PlayerDecoders/M3UDecoder.vala - src/Core/PlayerDecoders/PLSDecoder.vala - src/Core/PlayerDecoders/ASXDecoder.vala - src/Core/WidgetManager.vala - - src/UserInterface/Menus/ApplicationMenu.vala - src/UserInterface/Menus/StationsTreeViewContextMenu.vala - - src/UserInterface/Views/WelcomeView.vala - src/UserInterface/Views/StationsListView.vala - - src/UserInterface/Widgets/HeaderBar.vala - src/UserInterface/Widgets/SideBar.vala - src/UserInterface/Widgets/ViewStack.vala - src/UserInterface/Widgets/StationsListStore.vala - src/UserInterface/Widgets/GenresListStore.vala - src/UserInterface/Widgets/StationsTreeView.vala - src/UserInterface/Widgets/StationsTreeViewScrollable.vala - src/UserInterface/Widgets/GenresTreeView.vala - src/UserInterface/Widgets/GenresTreeViewScrollable.vala - src/UserInterface/Widgets/GenresTreeViewToolbar.vala - src/UserInterface/Widgets/SideBarExpandableItem.vala - src/UserInterface/Widgets/LevelBar.vala - src/UserInterface/Widgets/DiscoverBox.vala - src/UserInterface/Widgets/MainStack.vala - - src/UserInterface/Dialogs/StationDialog.vala - src/UserInterface/Dialogs/AddStationDialog.vala - src/UserInterface/Dialogs/EditStationDialog.vala - src/UserInterface/Dialogs/ErrorDialog.vala - src/UserInterface/Dialogs/ProgressDialog.vala - src/UserInterface/Dialogs/ImportProgressDialog.vala - - src/UserInterface/Others/FileChooserCreator.vala - - src/UserInterface/Windows/MainWindow.vala -PACKAGES - ${PROJECT_DEPS} -OPTIONS ---enable-experimental -) - -add_subdirectory (po) - -add_executable(${EXEC_NAME} ${VALA_C}) -install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin) -install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.dreamdevel.eradio.desktop DESTINATION ${DATADIR}/applications/) -install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.dreamdevel.eradio.appdata.xml DESTINATION ${DATADIR}/metainfo/) - -set(SYSTEM_DEFAULT_THEME ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor) - -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/discoverBig.png DESTINATION ${PKGDATADIR}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/16x16/apps/com.github.dreamdevel.eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/16x16/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/24x24/apps/com.github.dreamdevel.eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/24x24/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/32x32/apps/com.github.dreamdevel.eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/32x32/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/48x48/apps/com.github.dreamdevel.eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/48x48/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/128x128/apps/com.github.dreamdevel.eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/128x128/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/256x256/apps/com.github.dreamdevel.eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/256x256/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/512x512/apps/com.github.dreamdevel.eradio.png DESTINATION ${SYSTEM_DEFAULT_THEME}/512x512/apps) - -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/16x16/apps/eradio-all-stations.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/16x16/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/16x16/apps/eradio-favorites.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/16x16/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/16x16/apps/eradio-genre.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/16x16/apps) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/icons/16x16/apps/eradio-discover.svg DESTINATION ${SYSTEM_DEFAULT_THEME}/16x16/apps) - -install(CODE "execute_process(COMMAND \"gtk-update-icon-cache\" \"-f\" \"/usr/share/icons/hicolor/\")") -install(CODE "execute_process(COMMAND \"xdg-mime\" \"default\" \"com.github.dreamdevel.eradio.desktop\" \"x-scheme-handler/webradio\")") diff --git a/README.md b/README.md index 559042f..916ea45 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,49 @@ -# eRadio # -**A minimalist and powerful radio player for elementary OS** +

+ Icon +

- +

eRadio

+

A minimalist and powerful radio player for elementary OS

-## Build & Install +

+ Screenshot +

-**elementary OS Loki** +## Developing and building -* git clone https://github.com/DreamDevel/eRadio -* cd eRadio -* run ". ./tools/dev-shell" to export project PATH -* run "install-deps" to install all dependencies -* run "build" to build the project -* run "install-app" to install eradio, icons and schemas +Development is targeted at [elementary OS] Juno. If you want to hack on and +build eRadio yourself, you'll need the following dependencies: +- gstreamer-1.0 +- gtk+-3.0 +- granite +- sqlite3 +- gee-0.8 +- libnotify +- json-glib-1.0 +- libsoup-2.4 +- libxml-2.0 +- sqlheavy-0.1 -**Ubuntu 16.04 Based Distros** +You can install them on elementary OS Juno with: -* Install libsqlheavy & libsqlheavy-dev (https://launchpad.net/%7Eelementary-os/+archive/ubuntu/stable/+sourcepub/3335498/+listing-archive-extra) -* git clone https://github.com/DreamDevel/eRadio -* cd eRadio -* run ". ./tools/dev-shell" to export project PATH -* run "install-deps-ubuntu" to install all dependencies and add elementary ppa -* run "build" to build the project -* run "install-app" to install eradio, icons and schemas +```shell +sudo apt install elementary-sdk +``` -Note : Use build & run command for development after installation +Run `meson build` to configure the build environment and run `ninja install` +to install: + +```shell +meson build --prefix=/usr +cd build +sudo ninja install +``` + +Then run it with: + +```shell +com.github.dreamdevel.eradio +``` + +[elementary OS]: https://elementary.io diff --git a/cmake/FindGirCompiler.cmake b/cmake/FindGirCompiler.cmake deleted file mode 100644 index ccec563..0000000 --- a/cmake/FindGirCompiler.cmake +++ /dev/null @@ -1,56 +0,0 @@ -## -# Copyright 2009-2010 Jakob Westhoff. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those -# of the authors and should not be interpreted as representing official policies, -# either expressed or implied, of Jakob Westhoff -## - -## -# Find module for the Gir compiler (g-ir-compiler) -# -# This module determines wheter a Gir compiler is installed on the current -# system and where its executable is. -# -# Call the module using "find_package(GirCompiler) from within your CMakeLists.txt. -# -# The following variables will be set after an invocation: -# -# G_IR_COMPILER_FOUND Whether the g-ir-compiler compiler has been found or not -# G_IR_COMPILER_EXECUTABLE Full path to the g-ir-compiler executable if it has been found -## - - -# Search for the g-ir-compiler executable in the usual system paths. -find_program (G_IR_COMPILER_EXECUTABLE - NAMES g-ir-compiler) - -# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call. -# Furthermore set G_IR_COMPILER_FOUND to TRUE if the g-ir-compiler has been found (aka. -# G_IR_COMPILER_EXECUTABLE is set) - -include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (GirCompiler DEFAULT_MSG G_IR_COMPILER_EXECUTABLE) - -mark_as_advanced (G_IR_COMPILER_EXECUTABLE) diff --git a/cmake/FindVala.cmake b/cmake/FindVala.cmake deleted file mode 100644 index aa3a6e7..0000000 --- a/cmake/FindVala.cmake +++ /dev/null @@ -1,65 +0,0 @@ -## -# Copyright 2009-2010 Jakob Westhoff. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those -# of the authors and should not be interpreted as representing official policies, -# either expressed or implied, of Jakob Westhoff -## - -## -# Find module for the Vala compiler (valac) -# -# This module determines wheter a Vala compiler is installed on the current -# system and where its executable is. -# -# Call the module using "find_package(Vala) from within your CMakeLists.txt. -# -# The following variables will be set after an invocation: -# -# VALA_FOUND Whether the vala compiler has been found or not -# VALA_EXECUTABLE Full path to the valac executable if it has been found -# VALA_VERSION Version number of the available valac -## - - -# Search for the valac executable in the usual system paths. -find_program(VALA_EXECUTABLE - NAMES valac) - -# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call. -# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka. -# VALA_EXECUTABLE is set) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE) - -mark_as_advanced(VALA_EXECUTABLE) - -# Determine the valac version -if(VALA_FOUND) - execute_process(COMMAND ${VALA_EXECUTABLE} "--version" - OUTPUT_VARIABLE "VALA_VERSION") - string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION}) - string(STRIP ${VALA_VERSION} "VALA_VERSION") -endif(VALA_FOUND) diff --git a/cmake/GObjectIntrospectionMacros.cmake b/cmake/GObjectIntrospectionMacros.cmake deleted file mode 100644 index 6a0dc0b..0000000 --- a/cmake/GObjectIntrospectionMacros.cmake +++ /dev/null @@ -1,34 +0,0 @@ -macro(add_target_gir TARGET_NAME GIR_NAME HEADER CFLAGS GRANITE_VERSION) - set(PACKAGES "") - foreach(PKG ${ARGN}) - set(PACKAGES ${PACKAGES} --include=${PKG}) - endforeach() - install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\") - execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME} - --quiet - --library ${TARGET_NAME} ${PACKAGES} - -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir - -L${CMAKE_CURRENT_BINARY_DIR} - --nsversion=${GRANITE_VERSION} ${HEADER})") - install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/) -endmacro() - -macro(add_target_gir_with_executable TARGET_NAME EXE_NAME GIR_NAME HEADER EXE_HEADER CFLAGS GRANITE_VERSION) - set(PACKAGES "") - foreach(PKG ${ARGN}) - set(PACKAGES ${PACKAGES} --include=${PKG}) - endforeach() - install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\") - execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME} - --quiet - --library ${TARGET_NAME} --program ${EXE_NAME} ${PACKAGES} - -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir - -L${CMAKE_CURRENT_BINARY_DIR} - -I${CMAKE_CURRENT_BINARY_DIR} - --nsversion=${GRANITE_VERSION} ${HEADER} ${EXE_HEADER})") - install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/) -endmacro() diff --git a/cmake/GSettings.cmake b/cmake/GSettings.cmake deleted file mode 100644 index 8fd745c..0000000 --- a/cmake/GSettings.cmake +++ /dev/null @@ -1,42 +0,0 @@ -# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them. - -option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ON) - -option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL}) - -if(GSETTINGS_LOCALINSTALL) - message(STATUS "GSettings schemas will be installed locally.") -endif() - -if(GSETTINGS_COMPILE) - message(STATUS "GSettings shemas will be compiled.") -endif() - -macro(add_schema SCHEMA_NAME) - - set(PKG_CONFIG_EXECUTABLE pkg-config) - # Have an option to not install the schema into where GLib is - if (GSETTINGS_LOCALINSTALL) - SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/") - else (GSETTINGS_LOCALINSTALL) - execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE) - SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/") - endif (GSETTINGS_LOCALINSTALL) - - # Run the validator and error if it fails - execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE) - - if (_schemas_invalid) - message (SEND_ERROR "Schema validation error: ${_schemas_invalid}") - endif (_schemas_invalid) - - # Actually install and recomple schemas - message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}") - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL) - - if (GSETTINGS_COMPILE) - install (CODE "message (STATUS \"Compiling GSettings schemas\")") - install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})") - endif () -endmacro() diff --git a/cmake/ParseArguments.cmake b/cmake/ParseArguments.cmake deleted file mode 100644 index 717c0f5..0000000 --- a/cmake/ParseArguments.cmake +++ /dev/null @@ -1,36 +0,0 @@ -## -# This is a helper Macro to parse optional arguments in Macros/Functions -# It has been taken from the public CMake wiki. -# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and -# licensing. -## -macro(parse_arguments prefix arg_names option_names) - set(DEFAULT_ARGS) - foreach(arg_name ${arg_names}) - set(${prefix}_${arg_name}) - endforeach(arg_name) - foreach(option ${option_names}) - set(${prefix}_${option} FALSE) - endforeach(option) - - set(current_arg_name DEFAULT_ARGS) - set(current_arg_list) - foreach(arg ${ARGN}) - set(larg_names ${arg_names}) - list(FIND larg_names "${arg}" is_arg_name) - if(is_arg_name GREATER -1) - set(${prefix}_${current_arg_name} ${current_arg_list}) - set(current_arg_name ${arg}) - set(current_arg_list) - else(is_arg_name GREATER -1) - set(loption_names ${option_names}) - list(FIND loption_names "${arg}" is_option) - if(is_option GREATER -1) - set(${prefix}_${arg} TRUE) - else(is_option GREATER -1) - set(current_arg_list ${current_arg_list} ${arg}) - endif(is_option GREATER -1) - endif(is_arg_name GREATER -1) - endforeach(arg) - set(${prefix}_${current_arg_name} ${current_arg_list}) -endmacro(parse_arguments) diff --git a/cmake/README b/cmake/README deleted file mode 100644 index 9d45b32..0000000 --- a/cmake/README +++ /dev/null @@ -1,10 +0,0 @@ - Elementary CMake modules - -This is a set of CMake modules: Translations, GSettings, and Vala modules. - -For all the Vala related modules see README.Vala.rst: - - ParseArguments.cmake - - ValaPrecompile.cmake - - ValaVersion.cmake - - FindVala.cmake - diff --git a/cmake/README.Vala.rst b/cmake/README.Vala.rst deleted file mode 100644 index bcc59b7..0000000 --- a/cmake/README.Vala.rst +++ /dev/null @@ -1,173 +0,0 @@ -========== -Vala CMake -========== -:Author: - Jakob Westhoff -:Version: - Draft - - -Overview -======== - -Vala CMake is a collection of macros for the CMake_ build system to allow the -creation and management of projects developed using the Vala_ programming -language or its "Genie" flavor (less tested). - - -Installation -============ - -To use the Vala macros in your own project you need to copy the macro files to -an arbitrary folder in your projects directory and reference them in your -``CMakeLists.txt`` file. - -Assuming the macros are stored under ``cmake/vala`` in your projects folder you -need to add the following information to your base ``CMakeLists.txt``:: - - list(APPEND CMAKE_MODULE_PATH - ${CMAKE_SOURCE_DIR}/cmake/vala - ) - -After the new module path as been added you can simply include the provided -modules or use the provided find routines. - - -Finding Vala -============ - -The find module for vala works like any other Find module in CMake. -You can use it by simply calling the usual ``find_package`` function. Default -parameters like ``REQUIRED`` and ``QUIETLY`` are supported. - -:: - - find_package(Vala REQUIRED) - -After a successful call to the find_package function the following variables -will be set: - -VALA_FOUND - Whether the vala compiler has been found or not - -VALA_EXECUTABLE - Full path to the valac executable if it has been found - -VALA_VERSION - Version number of the available valac - - -Precompiling Vala sources -========================= - -CMake is mainly supposed to handle c or c++ based projects. Luckily every vala -program is translated into plain c code using the vala compiler, followed by -normal compilation of the generated c program using gcc. - -The macro ``vala_precompile`` uses that fact to create c files from your .vala -sources for further CMake processing. - -The first parameter provided is a variable, which will be filled with a list of -c files outputted by the vala compiler. This list can than be used in -conjunction with functions like ``add_executable`` or others to create the -necessary compile rules with CMake. - -The initial variable is followed by a list of .vala files to be compiled. -Please take care to add every vala file belonging to the currently compiled -project or library as Vala will otherwise not be able to resolve all -dependencies. - -The following sections may be specified afterwards to provide certain options -to the vala compiler: - -PACKAGES - A list of vala packages/libraries to be used during the compile cycle. The - package names are exactly the same, as they would be passed to the valac - "--pkg=" option. - -OPTIONS - A list of optional options to be passed to the valac executable. This can be - used to pass "--thread" for example to enable multi-threading support. - -DIRECTORY - Specify the directory where the output source files will be stored. If - ommitted, the source files will be stored in CMAKE_CURRENT_BINARY_DIR. - -CUSTOM_VAPIS - A list of custom vapi files to be included for compilation. This can be - useful to include freshly created vala libraries without having to install - them in the system. - -GENERATE_VAPI - Pass all the needed flags to the compiler to create an internal vapi for - the compiled library. The provided name will be used for this and a - .vapi file will be created. - -GENERATE_HEADER - Let the compiler generate a header file for the compiled code. There will - be a header file as well as an internal header file being generated called - .h and _internal.h - -The following call is a simple example to the vala_precompile macro showing an -example to every of the optional sections:: - - vala_precompile(VALA_C - source1.vala - source2.vala - source3.vala - PACKAGES - gtk+-2.0 - gio-1.0 - posix - OPTIONS - --thread - CUSTOM_VAPIS - some_vapi.vapi - GENERATE_VAPI - myvapi - GENERATE_HEADER - myheader - ) - -Most important is the variable VALA_C which will contain all the generated c -file names after the call. The easiest way to use this information is to tell -CMake to create an executable out of it. - -:: - - add_executable(myexecutable ${VALA_C}) - - -Further reading -=============== - -The `Pdf Presenter Console`__ , which is a vala based project of mine, makes -heavy usage of the here described macros. To look at a real world example of -these macros the mentioned project is the right place to take a look. The svn -trunk of it can be found at:: - - svn://pureenergy.cc/pdf_presenter_console/trunk - - -__ http://westhoffswelt.de/projects/pdf_presenter_console.html - - -Acknowledgments -=============== - -Thanks go out to Florian Sowade, a fellow local PHP-Usergroupie, who helped me -a lot with the initial version of this macros and always answered my mostly -dumb CMake questions. - -.. _CMake: http://cmake.org -.. _Vala: http://live.gnome.org/Vala -.. _Genie: http://live.gnome.org/Genie - - - -.. - Local Variables: - mode: rst - fill-column: 79 - End: - vim: et syn=rst tw=79 diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake deleted file mode 100644 index 76ba0b7..0000000 --- a/cmake/Tests.cmake +++ /dev/null @@ -1,5 +0,0 @@ -# Test macros for Marlin, feel free to re-use them. - -macro(add_test_executable EXE_NAME) - add_test(${EXE_NAME} gtester ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}) -endmacro() diff --git a/cmake/Translations.cmake b/cmake/Translations.cmake deleted file mode 100644 index 1a16d0c..0000000 --- a/cmake/Translations.cmake +++ /dev/null @@ -1,66 +0,0 @@ -# Translations.cmake, CMake macros written for Marlin, feel free to re-use them - -macro(add_translations_directory NLS_PACKAGE) - add_custom_target (i18n ALL COMMENT “Building i18n messages.”) - find_program (MSGFMT_EXECUTABLE msgfmt) - file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po) - foreach (PO_INPUT ${PO_FILES}) - get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE) - set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo) - add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT}) - - install (FILES ${MO_OUTPUT} DESTINATION - share/locale/${PO_INPUT_BASE}/LC_MESSAGES - RENAME ${NLS_PACKAGE}.mo) - endforeach (PO_INPUT ${PO_FILES}) -endmacro(add_translations_directory) - - -macro(add_translations_catalog NLS_PACKAGE) - add_custom_target (pot COMMENT “Building translation catalog.”) - find_program (XGETTEXT_EXECUTABLE xgettext) - - set(C_SOURCE "") - set(VALA_SOURCE "") - set(GLADE_SOURCE "") - - foreach(FILES_INPUT ${ARGN}) - set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}) - - file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.c) - foreach(C_FILE ${SOURCE_FILES}) - set(C_SOURCE ${C_SOURCE} ${C_FILE}) - endforeach() - - file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.vala) - foreach(VALA_C_FILE ${SOURCE_FILES}) - set(VALA_SOURCE ${VALA_SOURCE} ${VALA_C_FILE}) - endforeach() - - file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.ui) - foreach(GLADE_C_FILE ${SOURCE_FILES}) - set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_C_FILE}) - endforeach() - endforeach() - - set(BASE_XGETTEXT_COMMAND - ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} - -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot - --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g" --from-code=UTF-8) - - set(CONTINUE_FLAG "") - - IF(NOT "${C_SOURCE}" STREQUAL "") - add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE}) - set(CONTINUE_FLAG "-j") - ENDIF() - - IF(NOT "${VALA_SOURCE}" STREQUAL "") - add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE}) - set(CONTINUE_FLAG "-j") - ENDIF() - - IF(NOT "${GLADE_SOURCE}" STREQUAL "") - add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE}) - ENDIF() -endmacro() diff --git a/cmake/ValaPrecompile.cmake b/cmake/ValaPrecompile.cmake deleted file mode 100644 index 6a8bafb..0000000 --- a/cmake/ValaPrecompile.cmake +++ /dev/null @@ -1,250 +0,0 @@ -## -# Copyright 2009-2010 Jakob Westhoff. All rights reserved. -# Copyright 2012 elementary. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those -# of the authors and should not be interpreted as representing official policies, -# either expressed or implied, of Jakob Westhoff -## - -include(ParseArguments) -find_package(Vala REQUIRED) - -## -# Compile vala files to their c equivalents for further processing. -# -# The "vala_precompile" macro takes care of calling the valac executable on the -# given source to produce c files which can then be processed further using -# default cmake functions. -# -# The first parameter provided is a variable, which will be filled with a list -# of c files outputted by the vala compiler. This list can than be used in -# conjuction with functions like "add_executable" or others to create the -# neccessary compile rules with CMake. -# -# The initial variable is followed by a list of .vala files to be compiled. -# Please take care to add every vala file belonging to the currently compiled -# project or library as Vala will otherwise not be able to resolve all -# dependencies. -# -# The following sections may be specified afterwards to provide certain options -# to the vala compiler: -# -# PACKAGES -# A list of vala packages/libraries to be used during the compile cycle. The -# package names are exactly the same, as they would be passed to the valac -# "--pkg=" option. -# -# OPTIONS -# A list of optional options to be passed to the valac executable. This can be -# used to pass "--thread" for example to enable multi-threading support. -# -# CUSTOM_VAPIS -# A list of custom vapi files to be included for compilation. This can be -# useful to include freshly created vala libraries without having to install -# them in the system. -# -# GENERATE_VAPI -# Pass all the needed flags to the compiler to create an internal vapi for -# the compiled library. The provided name will be used for this and a -# .vapi file will be created. -# -# GENERATE_HEADER -# Let the compiler generate a header file for the compiled code. There will -# be a header file as well as an internal header file being generated called -# .h and _internal.h -# -# GENERATE_GIR -# Have the compiler generate a GObject-Introspection repository file with -# name: .gir. This can be later used to create a binary typelib -# using the GI compiler. -# -# GENERATE_SYMBOLS -# Output a .symbols file containing all the exported symbols. -# -# The following call is a simple example to the vala_precompile macro showing -# an example to every of the optional sections: -# -# vala_precompile(VALA_C mytargetname -# source1.vala -# source2.vala -# source3.vala -# PACKAGES -# gtk+-2.0 -# gio-1.0 -# posix -# DIRECTORY -# gen -# OPTIONS -# --thread -# CUSTOM_VAPIS -# some_vapi.vapi -# GENERATE_VAPI -# myvapi -# GENERATE_HEADER -# myheader -# GENERATE_GIR -# mygir -# GENERATE_SYMBOLS -# mysymbols -# ) -# -# Most important is the variable VALA_C which will contain all the generated c -# file names after the call. -## - -macro(vala_precompile output target_name) - parse_arguments(ARGS "TARGET;PACKAGES;OPTIONS;DIRECTORY;GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN}) - - if(ARGS_DIRECTORY) - set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY}) - else(ARGS_DIRECTORY) - set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - endif(ARGS_DIRECTORY) - include_directories(${DIRECTORY}) - set(vala_pkg_opts "") - foreach(pkg ${ARGS_PACKAGES}) - list(APPEND vala_pkg_opts "--pkg=${pkg}") - endforeach(pkg ${ARGS_PACKAGES}) - set(in_files "") - set(out_files "") - set(out_files_display "") - set(${output} "") - - foreach(src ${ARGS_DEFAULT_ARGS}) - string(REGEX MATCH "^/" IS_MATCHED ${src}) - if(${IS_MATCHED} MATCHES "/") - set(src_file_path ${src}) - else() - set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src}) - endif() - list(APPEND in_files ${src_file_path}) - string(REPLACE ".vala" ".c" src ${src}) - string(REPLACE ".gs" ".c" src ${src}) - if(${IS_MATCHED} MATCHES "/") - get_filename_component(VALA_FILE_NAME ${src} NAME) - set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}") - list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}") - else() - set(out_file "${DIRECTORY}/${src}") - list(APPEND out_files "${DIRECTORY}/${src}") - endif() - list(APPEND ${output} ${out_file}) - list(APPEND out_files_display "${src}") - endforeach(src ${ARGS_DEFAULT_ARGS}) - - set(custom_vapi_arguments "") - if(ARGS_CUSTOM_VAPIS) - foreach(vapi ${ARGS_CUSTOM_VAPIS}) - if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) - list(APPEND custom_vapi_arguments ${vapi}) - else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) - list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi}) - endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) - endforeach(vapi ${ARGS_CUSTOM_VAPIS}) - endif(ARGS_CUSTOM_VAPIS) - - set(vapi_arguments "") - if(ARGS_GENERATE_VAPI) - list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi") - list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi") - set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi") - - # Header and internal header is needed to generate internal vapi - if (NOT ARGS_GENERATE_HEADER) - set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI}) - endif(NOT ARGS_GENERATE_HEADER) - endif(ARGS_GENERATE_VAPI) - - set(header_arguments "") - if(ARGS_GENERATE_HEADER) - list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h") - list(APPEND out_files_display "${ARGS_GENERATE_HEADER}.h") - list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h") - endif(ARGS_GENERATE_HEADER) - - set(gir_arguments "") - set(gircomp_command "") - if(ARGS_GENERATE_GIR) - list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir") - list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir") - set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir") - - include (FindGirCompiler) - find_package(GirCompiler REQUIRED) - - set(gircomp_command - COMMAND - ${G_IR_COMPILER_EXECUTABLE} - ARGS - "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir" - -o "${DIRECTORY}/${ARGS_GENERATE_GIR}.typelib") - endif(ARGS_GENERATE_GIR) - - set(symbols_arguments "") - if(ARGS_GENERATE_SYMBOLS) - list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_SYMBOLS}.symbols") - list(APPEND out_files_display "${ARGS_GENERATE_SYMBOLS}.symbols") - set(symbols_arguments "--symbols=${ARGS_GENERATE_SYMBOLS}.symbols") - endif(ARGS_GENERATE_SYMBOLS) - - # Workaround for a bug that would make valac run twice. This file is written - # after the vala compiler generates C source code. - set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp) - - add_custom_command( - OUTPUT - ${OUTPUT_STAMP} - COMMAND - ${VALA_EXECUTABLE} - ARGS - "-C" - ${header_arguments} - ${vapi_arguments} - ${gir_arguments} - ${symbols_arguments} - "-b" ${CMAKE_CURRENT_SOURCE_DIR} - "-d" ${DIRECTORY} - ${vala_pkg_opts} - ${ARGS_OPTIONS} - "-g" - "--save-temps" - ${in_files} - ${custom_vapi_arguments} - COMMAND - touch - ARGS - ${OUTPUT_STAMP} - DEPENDS - ${in_files} - ${ARGS_CUSTOM_VAPIS} - COMMENT - "Generating ${out_files_display}" - ${gircomp_command} - ) - - # This command will be run twice for some reason (pass a non-empty string to COMMENT - # in order to see it). Since valac is not executed from here, this won't be a problem. - add_custom_command(OUTPUT ${out_files} DEPENDS ${OUTPUT_STAMP} COMMENT "") -endmacro(vala_precompile) diff --git a/cmake/ValaVersion.cmake b/cmake/ValaVersion.cmake deleted file mode 100644 index 3fff193..0000000 --- a/cmake/ValaVersion.cmake +++ /dev/null @@ -1,96 +0,0 @@ -## -# Copyright 2009-2010 Jakob Westhoff. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those -# of the authors and should not be interpreted as representing official policies, -# either expressed or implied, of Jakob Westhoff -## - -include(ParseArguments) -find_package(Vala REQUIRED) - -## -# Ensure a certain valac version is available -# -# The initial argument is the version to check for -# -# It may be followed by a optional parameter to specifiy a version range. The -# following options are valid: -# -# EXACT -# Vala needs to be available in the exact version given -# -# MINIMUM -# The provided version is the minimum version. Therefore Vala needs to be -# available in the given version or any higher version -# -# MAXIMUM -# The provided version is the maximum. Therefore Vala needs to be available -# in the given version or any version older than this -# -# If no option is specified the version will be treated as a minimal version. -## -macro(ensure_vala_version version) - parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN}) - set(compare_message "") - set(error_message "") - if(ARGS_MINIMUM) - set(compare_message "a minimum ") - set(error_message "or greater ") - elseif(ARGS_MAXIMUM) - set(compare_message "a maximum ") - set(error_message "or less ") - endif(ARGS_MINIMUM) - - message(STATUS - "checking for ${compare_message}Vala version of ${version}" - ) - - unset(version_accepted) - - # MINIMUM is the default if no option is specified - if(ARGS_EXACT) - if(${VALA_VERSION} VERSION_EQUAL ${version} ) - set(version_accepted TRUE) - endif(${VALA_VERSION} VERSION_EQUAL ${version}) - elseif(ARGS_MAXIMUM) - if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) - set(version_accepted TRUE) - endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) - else(ARGS_MAXIMUM) - if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) - set(version_accepted TRUE) - endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version}) - endif(ARGS_EXACT) - - if (NOT version_accepted) - message(FATAL_ERROR - "Vala version ${version} ${error_message}is required." - ) - endif(NOT version_accepted) - - message(STATUS - " found Vala, version ${VALA_VERSION}" - ) -endmacro(ensure_vala_version) diff --git a/data/com.github.dreamdevel.eradio.appdata.xml b/data/com.github.dreamdevel.eradio.appdata.xml deleted file mode 100644 index 4fe787e..0000000 --- a/data/com.github.dreamdevel.eradio.appdata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - com.github.dreamdevel.eradio.desktop - CC0 - GPL-3.0+ - eRadio - A minimalist and powerful radio player - -

eRadio is a radio player with native desktop features such as: Sound indicator integration, Media Keys Support, Notifications.

-

It support many stream types including m3u, pls, asx and has a webradio URI scheme to easily add new stations from your internet browser

-

You can also backup and import radio stations via erpkg files

- - Dream Development - - 2 - - diff --git a/data/com.github.dreamdevel.eradio.appdata.xml.in b/data/com.github.dreamdevel.eradio.appdata.xml.in new file mode 100644 index 0000000..658d774 --- /dev/null +++ b/data/com.github.dreamdevel.eradio.appdata.xml.in @@ -0,0 +1,68 @@ + + + + com.github.dreamdevel.eradio.desktop + CC0 + GPL-3.0+ + eRadio + A minimalist and powerful radio player + +

eRadio is a radio player with native desktop features such as: Sound indicator integration, Media Keys Support, Notifications.

+

It support many stream types including m3u, pls, asx and has a webradio URI scheme to easily add new stations from your internet browser

+

You can also backup and import radio stations via erpkg files

+ + + com.github.dreamdevel.eradio + + + + +

Initial release for elementary Juno

+ + + + + + https://raw.githubusercontent.com/dreamdevel/eradio/master/data/window-screenshot.png + + + + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + + Dream Development + https://github.com/dreamdevel/eradio/ + https://github.com/dreamdevel/eradio/issues + https://github.com/dreamdevel/eradio/tree/master/po + http://eradio.dreamdevel.com/donate + + #039be5 + #212121* + 2 + + \ No newline at end of file diff --git a/data/com.github.dreamdevel.eradio.desktop b/data/com.github.dreamdevel.eradio.desktop.in similarity index 84% rename from data/com.github.dreamdevel.eradio.desktop rename to data/com.github.dreamdevel.eradio.desktop.in index 469b3ac..a933ed3 100644 --- a/data/com.github.dreamdevel.eradio.desktop +++ b/data/com.github.dreamdevel.eradio.desktop.in @@ -13,7 +13,3 @@ X-GNOME-UsesNotifications=true X-AppInstall-Keywords=Eradio;Stream;Radio;Music;Audio MimeType=x-scheme-handler/webradio; Actions=AboutDialog; - -[Desktop Action AboutDialog] -Exec=com.github.dreamdevel.eradio --about -Name=About eRadio diff --git a/data/com.github.dreamdevel.eradio.gresource.xml b/data/com.github.dreamdevel.eradio.gresource.xml new file mode 100644 index 0000000..c748ed7 --- /dev/null +++ b/data/com.github.dreamdevel.eradio.gresource.xml @@ -0,0 +1,10 @@ + + + + icons/eradio/eradio-all-stations.svg + icons/eradio/eradio-discover.svg + icons/eradio/eradio-empty-favorites.svg + icons/eradio/eradio-favorites.svg + icons/eradio/eradio-genre.svg + + diff --git a/images/icons/48x48/apps/com.github.dreamdevel.eradio.png b/data/com.github.dreamdevel.eradio.png similarity index 100% rename from images/icons/48x48/apps/com.github.dreamdevel.eradio.png rename to data/com.github.dreamdevel.eradio.png diff --git a/data/icons/128/com.github.dreamdevel.eradio.svg b/data/icons/128/com.github.dreamdevel.eradio.svg new file mode 100644 index 0000000..d2d17a1 --- /dev/null +++ b/data/icons/128/com.github.dreamdevel.eradio.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/16/com.github.dreamdevel.eradio.svg b/data/icons/16/com.github.dreamdevel.eradio.svg new file mode 100644 index 0000000..83b6bfe --- /dev/null +++ b/data/icons/16/com.github.dreamdevel.eradio.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/24/com.github.dreamdevel.eradio.svg b/data/icons/24/com.github.dreamdevel.eradio.svg new file mode 100644 index 0000000..eb53c9f --- /dev/null +++ b/data/icons/24/com.github.dreamdevel.eradio.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/32/com.github.dreamdevel.eradio.svg b/data/icons/32/com.github.dreamdevel.eradio.svg new file mode 100644 index 0000000..abb9091 --- /dev/null +++ b/data/icons/32/com.github.dreamdevel.eradio.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/48/com.github.dreamdevel.eradio.svg b/data/icons/48/com.github.dreamdevel.eradio.svg new file mode 100644 index 0000000..0a7bb40 --- /dev/null +++ b/data/icons/48/com.github.dreamdevel.eradio.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/64/com.github.dreamdevel.eradio.svg b/data/icons/64/com.github.dreamdevel.eradio.svg new file mode 100644 index 0000000..c2f1d26 --- /dev/null +++ b/data/icons/64/com.github.dreamdevel.eradio.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/com.github.dreamdevel.eradio.svg b/data/icons/com.github.dreamdevel.eradio.svg new file mode 100644 index 0000000..3429768 --- /dev/null +++ b/data/icons/com.github.dreamdevel.eradio.svg @@ -0,0 +1,47 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/eradio/eradio-all-stations.svg b/data/icons/eradio/eradio-all-stations.svg new file mode 100644 index 0000000..9ca31ce --- /dev/null +++ b/data/icons/eradio/eradio-all-stations.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/data/icons/eradio/eradio-discover.svg b/data/icons/eradio/eradio-discover.svg new file mode 100644 index 0000000..e4bc878 --- /dev/null +++ b/data/icons/eradio/eradio-discover.svg @@ -0,0 +1,34 @@ + + + + + + + Explore + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/icons/16x16/apps/eradio-favorites.svg b/data/icons/eradio/eradio-empty-favorites.svg similarity index 75% rename from images/icons/16x16/apps/eradio-favorites.svg rename to data/icons/eradio/eradio-empty-favorites.svg index 2333a8f..690d561 100644 --- a/images/icons/16x16/apps/eradio-favorites.svg +++ b/data/icons/eradio/eradio-empty-favorites.svg @@ -15,8 +15,8 @@ viewBox="0 0 16 16" id="svg2" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="eradio-favorites.svg"> + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="eradio-empty-favorites.svg"> @@ -69,7 +69,8 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-1036.3622)"> + transform="translate(0,-1036.3622)" + style="display:inline"> + style="opacity:1;fill:#2b6e9a;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.64608747;stroke-miterlimit:4;stroke-dasharray:none" /> + diff --git a/data/icons/eradio/eradio-favorites.svg b/data/icons/eradio/eradio-favorites.svg new file mode 100644 index 0000000..a47618f --- /dev/null +++ b/data/icons/eradio/eradio-favorites.svg @@ -0,0 +1,33 @@ + + + + + + + Heart + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/icons/eradio/eradio-genre.svg b/data/icons/eradio/eradio-genre.svg new file mode 100644 index 0000000..da6d8dc --- /dev/null +++ b/data/icons/eradio/eradio-genre.svg @@ -0,0 +1,33 @@ + + + + + + + Music + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..7b9842b --- /dev/null +++ b/data/meson.build @@ -0,0 +1,54 @@ +icon_size = ['16', '24', '32', '48', '64', '128'] + +foreach i : icon_size + install_data( + join_paths('icons', i, meson.project_name() + '.svg'), + install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps') + ) + install_data( + join_paths('icons', i, meson.project_name() + '.svg'), + install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps') + ) +endforeach + +install_data( + 'icons/' + meson.project_name() + '.svg', + install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps') +) + +i18n.merge_file( + input: meson.project_name() + '.desktop.in', + output: meson.project_name() + '.desktop', + po_dir: join_paths(meson.source_root(), 'po', 'extra'), + type: 'desktop', + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') +) + +i18n.merge_file( + input: meson.project_name() + '.appdata.xml.in', + output: meson.project_name() + '.appdata.xml', + po_dir: join_paths(meson.source_root(), 'po', 'extra'), + install: true, + install_dir: join_paths(get_option('datadir'), 'metainfo') +) + +desktop_file_validate = find_program('desktop-file-validate', required: false) + +if desktop_file_validate.found() + test ( + 'Validate desktop file', + desktop_file_validate, + args: join_paths(meson.current_build_dir (), meson.project_name() + '.desktop') + ) +endif + +appstreamcli = find_program(['appstreamcli', 'appstream-util'], required: false) + +if appstreamcli.found() + test ( + 'Validate appdata file', + appstreamcli, + args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')] + ) +endif \ No newline at end of file diff --git a/data/window-screenshot.png b/data/window-screenshot.png new file mode 100644 index 0000000..03a14e2 Binary files /dev/null and b/data/window-screenshot.png differ diff --git a/debian/compat b/debian/compat index 45a4fb7..9a03714 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +10 \ No newline at end of file diff --git a/debian/control b/debian/control index 8d1883d..27508c7 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: com.github.dreamdevel.eradio Section: sound Priority: extra Maintainer: George Sofianos -Build-Depends: cmake (>= 2.8), - debhelper (>= 8.0.0), +Build-Depends: debhelper (>= 8.0.0), + gettext, valac-0.24 | valac (>= 0.24), libgstreamer1.0-dev, libgtk-3-dev, @@ -14,8 +14,9 @@ Build-Depends: cmake (>= 2.8), libjson-glib-dev, libsoup2.4-dev, libxml2-dev, - libsqlheavy-dev -Standards-Version: 3.9.3 + libsqlheavy-dev, + meson +Standards-Version: 4.1.1 Package: com.github.dreamdevel.eradio Architecture: any diff --git a/debian/copyright b/debian/copyright index 08dba6f..a548259 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: eradio Source: https://launchpad.net/eradio/ -Files: src/* data/* cmake/* debian/* shemas/* +Files: src/* data/* debian/* schemas/* Copyright: 2014-2016 George Sofianos License: GPL-3.0+ diff --git a/debian/rules b/debian/rules index e50e7cd..225d762 100755 --- a/debian/rules +++ b/debian/rules @@ -10,5 +10,20 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ +override_dh_auto_clean: + rm -rf debian/build + +override_dh_auto_configure: + mkdir -p debian/build + cd debian/build && meson --prefix=/usr ../.. + +override_dh_auto_build: + cd debian/build && ninja -v + +override_dh_auto_test: + cd debian/build && ninja test + +override_dh_auto_install: + cd debian/build && DESTDIR=${CURDIR}/debian/com.github.dreamdevel.eradio ninja install \ No newline at end of file diff --git a/eradio.sublime-project b/eradio.sublime-project deleted file mode 100644 index 518015a..0000000 --- a/eradio.sublime-project +++ /dev/null @@ -1,42 +0,0 @@ -{ - "build_systems": - [ - { - "cmd": - [ - "bash", - "../tools/build_from_sublime" - ], - "name": "Vala/Cmake", - "variants": - [ - { - "cmd": - [ - "pantheon-terminal --execute='${project_path:${folder}}/build/eradio --debug'" - ], - "name": "Run", - "shell": true - } - ], - "working_dir": "${project_path:${folder}}/build" - } - ], - "folders": - [ - { - "follow_symlinks": true, - "path": "." - } - ], - "settings": - { - "rulers": - [ - 120 - ], - "tab_size": 4, - "translate_tabs_to_spaces": true, - "use_tab_stops": true - } -} diff --git a/images/com.github.dreamdevel.eradio.svg b/images/com.github.dreamdevel.eradio.svg deleted file mode 100644 index ee31eaf..0000000 --- a/images/com.github.dreamdevel.eradio.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/discoverBig.png b/images/discoverBig.png deleted file mode 100644 index 4837a22..0000000 Binary files a/images/discoverBig.png and /dev/null differ diff --git a/images/icons/128x128/apps/com.github.dreamdevel.eradio.png b/images/icons/128x128/apps/com.github.dreamdevel.eradio.png deleted file mode 100644 index 0f3ed00..0000000 Binary files a/images/icons/128x128/apps/com.github.dreamdevel.eradio.png and /dev/null differ diff --git a/images/icons/16x16/apps/com.github.dreamdevel.eradio.png b/images/icons/16x16/apps/com.github.dreamdevel.eradio.png deleted file mode 100644 index 83e56dc..0000000 Binary files a/images/icons/16x16/apps/com.github.dreamdevel.eradio.png and /dev/null differ diff --git a/images/icons/16x16/apps/eradio-all-stations.svg b/images/icons/16x16/apps/eradio-all-stations.svg deleted file mode 100644 index ad5d2db..0000000 --- a/images/icons/16x16/apps/eradio-all-stations.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/images/icons/16x16/apps/eradio-discover.svg b/images/icons/16x16/apps/eradio-discover.svg deleted file mode 100644 index a69d6cc..0000000 --- a/images/icons/16x16/apps/eradio-discover.svg +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - Explore - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/icons/16x16/apps/eradio-genre.svg b/images/icons/16x16/apps/eradio-genre.svg deleted file mode 100644 index 7fcf74b..0000000 --- a/images/icons/16x16/apps/eradio-genre.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - Music - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/images/icons/24x24/apps/com.github.dreamdevel.eradio.png b/images/icons/24x24/apps/com.github.dreamdevel.eradio.png deleted file mode 100644 index 159ac26..0000000 Binary files a/images/icons/24x24/apps/com.github.dreamdevel.eradio.png and /dev/null differ diff --git a/images/icons/256x256/apps/com.github.dreamdevel.eradio.png b/images/icons/256x256/apps/com.github.dreamdevel.eradio.png deleted file mode 100644 index 1a2dda2..0000000 Binary files a/images/icons/256x256/apps/com.github.dreamdevel.eradio.png and /dev/null differ diff --git a/images/icons/32x32/apps/com.github.dreamdevel.eradio.png b/images/icons/32x32/apps/com.github.dreamdevel.eradio.png deleted file mode 100644 index a661402..0000000 Binary files a/images/icons/32x32/apps/com.github.dreamdevel.eradio.png and /dev/null differ diff --git a/images/icons/512x512/apps/com.github.dreamdevel.eradio.png b/images/icons/512x512/apps/com.github.dreamdevel.eradio.png deleted file mode 100644 index 79cbe01..0000000 Binary files a/images/icons/512x512/apps/com.github.dreamdevel.eradio.png and /dev/null differ diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..e5b9245 --- /dev/null +++ b/meson.build @@ -0,0 +1,44 @@ +project('com.github.dreamdevel.eradio', 'vala', 'c', version: '2.0.1') + +gnome = import('gnome') +i18n = import('i18n') + +add_project_arguments( + '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), + language: 'c' +) + +asresources = gnome.compile_resources( + 'as-resources', + join_paths('data', meson.project_name() + '.gresource.xml'), + source_dir: 'data', + c_name: 'as' +) + +subdir('src') + +executable( + meson.project_name(), + asresources, + sources, + dependencies: [ + dependency('gstreamer-1.0'), + dependency('gtk+-3.0'), + dependency('granite'), + dependency('sqlite3'), + dependency('gee-0.8'), + dependency('libnotify'), + dependency('json-glib-1.0'), + dependency('libsoup-2.4'), + dependency('libxml-2.0'), + dependency('sqlheavy-0.1'), + meson.get_compiler('c').find_library('m', required: 'false') + ], + install: true +) + +subdir('data') +subdir('po') +subdir('schemas') + +meson.add_install_script('meson/post_install.py') diff --git a/meson/post_install.py b/meson/post_install.py new file mode 100755 index 0000000..878d234 --- /dev/null +++ b/meson/post_install.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python3 + +from os import path, environ +import subprocess + +prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local') +schemadir = path.join(environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') +datadir = path.join(prefix, 'share') + +if not environ.get('DESTDIR'): + print('Compiling gsettings schemas…') + subprocess.call(['glib-compile-schemas', schemadir]) + print('Updating icon cache…') + subprocess.call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')]) \ No newline at end of file diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt deleted file mode 100644 index 1dca0df..0000000 --- a/po/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -include (Translations) -add_translations_directory ("eradio") -add_translations_catalog ("eradio" - ../src -) diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..5815b13 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1,5 @@ +de +el +fr +hu +nl diff --git a/po/POTFILES b/po/POTFILES new file mode 100644 index 0000000..67df4b6 --- /dev/null +++ b/po/POTFILES @@ -0,0 +1,27 @@ +src/Core/MPRIS.vala +src/Core/Notifier.vala + +src/UserInterface/Menus/ApplicationMenu.vala +src/UserInterface/Menus/StationsTreeViewContextMenu.vala + +src/UserInterface/Views/WelcomeView.vala +src/UserInterface/Views/StationsListView.vala + +src/UserInterface/Widgets/HeaderBar.vala +src/UserInterface/Widgets/SideBar.vala +src/UserInterface/Widgets/StationsListStore.vala +src/UserInterface/Widgets/StationsTreeView.vala +src/UserInterface/Widgets/GenresListStore.vala +src/UserInterface/Widgets/GenresTreeView.vala +src/UserInterface/Widgets/GenresTreeViewToolbar.vala +src/UserInterface/Widgets/DiscoverBox.vala +src/UserInterface/Widgets/MainStack.vala + +src/UserInterface/Dialogs/StationDialog.vala +src/UserInterface/Dialogs/AddStationDialog.vala +src/UserInterface/Dialogs/EditStationDialog.vala +src/UserInterface/Dialogs/ErrorDialog.vala +src/UserInterface/Dialogs/ImportProgressDialog.vala + +src/UserInterface/Others/FileChooserCreator.vala + diff --git a/po/com.github.dreamdevel.eradio.pot b/po/com.github.dreamdevel.eradio.pot new file mode 100644 index 0000000..bff02e3 --- /dev/null +++ b/po/com.github.dreamdevel.eradio.pot @@ -0,0 +1,226 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.dreamdevel.eradio package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: com.github.dreamdevel.eradio\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-01-11 18:45+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/Core/MPRIS.vala:187 src/UserInterface/Widgets/StationsListStore.vala:111 +#: src/UserInterface/Widgets/StationsListStore.vala:173 +msgid "Unknown" +msgstr "" + +#: src/Core/Notifier.vala:37 +msgid "You are listening to." +msgstr "" + +#: src/UserInterface/Menus/ApplicationMenu.vala:43 +msgid "Add New Station" +msgstr "" + +#: src/UserInterface/Menus/ApplicationMenu.vala:44 +msgid "Backup" +msgstr "" + +#: src/UserInterface/Menus/ApplicationMenu.vala:45 +msgid "Import Stations" +msgstr "" + +#: src/UserInterface/Menus/ApplicationMenu.vala:46 +msgid "Export Stations" +msgstr "" + +#: src/UserInterface/Menus/ApplicationMenu.vala:47 +#: src/UserInterface/Widgets/DiscoverBox.vala:77 +msgid "Donate" +msgstr "" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 +msgid "Add to Favorites" +msgstr "" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 +msgid "Edit station info" +msgstr "" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 +msgid "Remove from Library" +msgstr "" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 +msgid "Remove from Favorites" +msgstr "" + +#: src/UserInterface/Views/WelcomeView.vala:26 +msgid "Add a station to begin listening" +msgstr "" + +#: src/UserInterface/Views/WelcomeView.vala:44 +msgid "Add" +msgstr "" + +#: src/UserInterface/Views/WelcomeView.vala:44 +msgid "Add a new station." +msgstr "" + +#: src/UserInterface/Views/WelcomeView.vala:45 +msgid "Import" +msgstr "" + +#: src/UserInterface/Views/WelcomeView.vala:45 +msgid "Import stations from eradio package." +msgstr "" + +#: src/UserInterface/Widgets/HeaderBar.vala:62 +msgid "Play" +msgstr "" + +#: src/UserInterface/Widgets/HeaderBar.vala:64 +msgid "Next Station" +msgstr "" + +#: src/UserInterface/Widgets/HeaderBar.vala:66 +msgid "Previous Station" +msgstr "" + +#: src/UserInterface/Widgets/HeaderBar.vala:96 +msgid "Menu" +msgstr "" + +#: src/UserInterface/Widgets/HeaderBar.vala:197 +msgid "Pause" +msgstr "" + +#: src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Dialogs/StationDialog.vala:90 +msgid "Genres" +msgstr "" + +#: src/UserInterface/Widgets/SideBar.vala:66 +#: src/UserInterface/Widgets/StationsListStore.vala:258 +msgid "All Stations" +msgstr "" + +#: src/UserInterface/Widgets/SideBar.vala:79 +#: src/UserInterface/Widgets/StationsListStore.vala:260 +msgid "Favorites" +msgstr "" + +#: src/UserInterface/Widgets/SideBar.vala:91 +#: src/UserInterface/Widgets/StationsListStore.vala:262 +#: src/UserInterface/Widgets/DiscoverBox.vala:67 +#: src/UserInterface/Widgets/MainStack.vala:61 +msgid "Discover" +msgstr "" + +#: src/UserInterface/Widgets/StationsTreeView.vala:76 +msgid "Station" +msgstr "" + +#: src/UserInterface/Widgets/StationsTreeView.vala:77 +#: src/UserInterface/Widgets/GenresTreeView.vala:58 +msgid "Genre" +msgstr "" + +#: src/UserInterface/Widgets/StationsTreeView.vala:78 +#: src/UserInterface/Dialogs/StationDialog.vala:117 +msgid "Url" +msgstr "" + +#: src/UserInterface/Widgets/GenresListStore.vala:25 +msgid "New Genre" +msgstr "" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:66 +msgid "Add Genre" +msgstr "" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:70 +msgid "Remove Genre" +msgstr "" + +#: src/UserInterface/Widgets/DiscoverBox.vala:69 +msgid "Find new radio stations instantly" +msgstr "" + +#: src/UserInterface/Widgets/DiscoverBox.vala:72 +msgid "This feature is currently not implemented." +msgstr "" + +#: src/UserInterface/Widgets/DiscoverBox.vala:74 +msgid "Support our work to keep improving our free applications." +msgstr "" + +#: src/UserInterface/Dialogs/StationDialog.vala:60 +#: src/UserInterface/Dialogs/ErrorDialog.vala:55 +msgid "Close" +msgstr "" + +#: src/UserInterface/Dialogs/StationDialog.vala:116 +msgid "Name" +msgstr "" + +#: src/UserInterface/Dialogs/AddStationDialog.vala:33 +msgid "Add Station" +msgstr "" + +#: src/UserInterface/Dialogs/EditStationDialog.vala:35 +msgid "Update Details" +msgstr "" + +#: src/UserInterface/Dialogs/ErrorDialog.vala:56 +msgid "Report a bug" +msgstr "" + +#: src/UserInterface/Dialogs/ErrorDialog.vala:67 +msgid "A problem occured while inserting station to database." +msgstr "" + +#: src/UserInterface/Dialogs/ErrorDialog.vala:76 +msgid "" +"If you believe this is a bug please report it to help us improve our " +"software." +msgstr "" + +#: src/UserInterface/Dialogs/ImportProgressDialog.vala:42 +msgid "Importing stations, please wait." +msgstr "" + +#: src/UserInterface/Others/FileChooserCreator.vala:24 +msgid "Import Radio Stations Package" +msgstr "" + +#: src/UserInterface/Others/FileChooserCreator.vala:26 +#: src/UserInterface/Others/FileChooserCreator.vala:48 +msgid "Cancel" +msgstr "" + +#: src/UserInterface/Others/FileChooserCreator.vala:27 +msgid "Open" +msgstr "" + +#: src/UserInterface/Others/FileChooserCreator.vala:40 +#: src/UserInterface/Others/FileChooserCreator.vala:62 +msgid "eRadio Package" +msgstr "" + +#: src/UserInterface/Others/FileChooserCreator.vala:46 +msgid "Export Radio Stations" +msgstr "" + +#: src/UserInterface/Others/FileChooserCreator.vala:49 +msgid "Save" +msgstr "" diff --git a/po/de.po b/po/de.po index 87d6429..493ddfb 100644 --- a/po/de.po +++ b/po/de.po @@ -1,188 +1,228 @@ -# German translation for eradio -# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016 -# This file is distributed under the same license as the eradio package. -# FIRST AUTHOR , 2016. +# German translations for com.github.dreamdevel.eradio package. +# Copyright (C) 2019 THE com.github.dreamdevel.eradio'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.dreamdevel.eradio package. +# Automatically generated, 2019. # msgid "" msgstr "" -"Project-Id-Version: eradio\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2016-10-25 12:52+0300\n" -"PO-Revision-Date: 2016-10-27 10:06+0000\n" -"Last-Translator: J.Ar \n" -"Language-Team: German \n" +"Project-Id-Version: com.github.dreamdevel.eradio\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-01-11 18:45+0100\n" +"PO-Revision-Date: 2019-04-22 13:32+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-10-31 14:56+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/Core/Notifier.vala:37 +#: src/Core/MPRIS.vala:187 src/UserInterface/Widgets/StationsListStore.vala:111 +#: src/UserInterface/Widgets/StationsListStore.vala:173 +msgid "Unknown" +msgstr "" + +#: src/Core/Notifier.vala:37 msgid "You are listening to." msgstr "Sie hören" -#: ../src/UserInterface/Views/WelcomeView.vala:26 +#: src/UserInterface/Menus/ApplicationMenu.vala:43 +msgid "Add New Station" +msgstr "Neuen Sender hinzufügen" + +#: src/UserInterface/Menus/ApplicationMenu.vala:44 +msgid "Backup" +msgstr "Sicherung" + +#: src/UserInterface/Menus/ApplicationMenu.vala:45 +msgid "Import Stations" +msgstr "Sender importieren" + +#: src/UserInterface/Menus/ApplicationMenu.vala:46 +msgid "Export Stations" +msgstr "Sender exportieren" + +#: src/UserInterface/Menus/ApplicationMenu.vala:47 +#: src/UserInterface/Widgets/DiscoverBox.vala:77 +msgid "Donate" +msgstr "Spenden" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 +msgid "Add to Favorites" +msgstr "Zu den Favoriten hinzufügen" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 +msgid "Edit station info" +msgstr "Senderliste bearbeiten" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 +msgid "Remove from Library" +msgstr "Aus der Sammlung entfernen" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 +msgid "Remove from Favorites" +msgstr "Aus den Favoriten entfernen" + +#: src/UserInterface/Views/WelcomeView.vala:26 msgid "Add a station to begin listening" msgstr "Sender hinzufügen um mit dem hören zu beginnen" -#: ../src/UserInterface/Views/WelcomeView.vala:44 +#: src/UserInterface/Views/WelcomeView.vala:44 msgid "Add" msgstr "Hinzufügen" -#: ../src/UserInterface/Views/WelcomeView.vala:44 +#: src/UserInterface/Views/WelcomeView.vala:44 msgid "Add a new station." msgstr "Neuen Sender hinzufügen" -#: ../src/UserInterface/Views/WelcomeView.vala:45 +#: src/UserInterface/Views/WelcomeView.vala:45 msgid "Import" msgstr "Importieren" -#: ../src/UserInterface/Views/WelcomeView.vala:45 +#: src/UserInterface/Views/WelcomeView.vala:45 msgid "Import stations from eradio package." msgstr "Sender aus eRadio Paket importieren" -#: ../src/UserInterface/Dialogs/EditStationDialog.vala:35 -msgid "Update Details" -msgstr "Details aktualisieren" +#: src/UserInterface/Widgets/HeaderBar.vala:62 +msgid "Play" +msgstr "" -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:55 -#: ../src/UserInterface/Dialogs/StationDialog.vala:60 -msgid "Close" -msgstr "Schließen" +#: src/UserInterface/Widgets/HeaderBar.vala:64 +msgid "Next Station" +msgstr "" -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:56 -msgid "Report a bug" -msgstr "Problem melden" +#: src/UserInterface/Widgets/HeaderBar.vala:66 +msgid "Previous Station" +msgstr "" -#: ../src/UserInterface/Dialogs/ImportProgressDialog.vala:42 -msgid "Importing stations, please wait." -msgstr "Sender werden importiert, bitte warten." +#: src/UserInterface/Widgets/HeaderBar.vala:96 +msgid "Menu" +msgstr "" -#: ../src/UserInterface/Dialogs/AddStationDialog.vala:33 -msgid "Add Station" -msgstr "Sender hinzufügen" +#: src/UserInterface/Widgets/HeaderBar.vala:197 +msgid "Pause" +msgstr "" -#: ../src/UserInterface/Dialogs/StationDialog.vala:90 -#: ../src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Dialogs/StationDialog.vala:90 msgid "Genres" msgstr "Genres" -#: ../src/UserInterface/Dialogs/StationDialog.vala:116 -msgid "Name" -msgstr "Name" - -#: ../src/UserInterface/Dialogs/StationDialog.vala:117 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:77 -msgid "Url" -msgstr "Internetadresse" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:24 -msgid "Import Radio Stations Package" -msgstr "Radiosender Paket importieren" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:26 -#: ../src/UserInterface/Others/FileChooserCreator.vala:48 -msgid "Cancel" -msgstr "Abbrechen" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:27 -msgid "Open" -msgstr "Öffnen" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:40 -#: ../src/UserInterface/Others/FileChooserCreator.vala:62 -msgid "eRadio Package" -msgstr "eRadio Paket" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:46 -msgid "Export Radio Stations" -msgstr "Radiosender exportieren" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:49 -msgid "Save" -msgstr "Speichern" - -#: ../src/UserInterface/Widgets/SideBar.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:215 +#: src/UserInterface/Widgets/SideBar.vala:66 +#: src/UserInterface/Widgets/StationsListStore.vala:258 msgid "All Stations" msgstr "Alle Sender" -#: ../src/UserInterface/Widgets/SideBar.vala:79 -#: ../src/UserInterface/Widgets/StationsListStore.vala:217 +#: src/UserInterface/Widgets/SideBar.vala:79 +#: src/UserInterface/Widgets/StationsListStore.vala:260 msgid "Favorites" msgstr "Favoriten" -#: ../src/UserInterface/Widgets/SideBar.vala:91 -#: ../src/UserInterface/Widgets/DiscoverBox.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:219 -#: ../src/UserInterface/Widgets/MainStack.vala:61 +#: src/UserInterface/Widgets/SideBar.vala:91 +#: src/UserInterface/Widgets/StationsListStore.vala:262 +#: src/UserInterface/Widgets/DiscoverBox.vala:67 +#: src/UserInterface/Widgets/MainStack.vala:61 msgid "Discover" msgstr "Entdecken" -#: ../src/UserInterface/Widgets/GenresListStore.vala:25 +#: src/UserInterface/Widgets/StationsTreeView.vala:76 +msgid "Station" +msgstr "Sender" + +#: src/UserInterface/Widgets/StationsTreeView.vala:77 +#: src/UserInterface/Widgets/GenresTreeView.vala:58 +msgid "Genre" +msgstr "Genre" + +#: src/UserInterface/Widgets/StationsTreeView.vala:78 +#: src/UserInterface/Dialogs/StationDialog.vala:117 +msgid "Url" +msgstr "Internetadresse" + +#: src/UserInterface/Widgets/GenresListStore.vala:25 msgid "New Genre" -msgstr "Neues Genre" +msgstr "" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:66 +msgid "Add Genre" +msgstr "" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:68 +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:70 +msgid "Remove Genre" +msgstr "" + +#: src/UserInterface/Widgets/DiscoverBox.vala:69 msgid "Find new radio stations instantly" msgstr "Finde neue Radio Stationen sofort" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:71 +#: src/UserInterface/Widgets/DiscoverBox.vala:72 msgid "This feature is currently not implemented." msgstr "Diese Funktion ist derzeit nicht implementiert." -#: ../src/UserInterface/Widgets/DiscoverBox.vala:73 +#: src/UserInterface/Widgets/DiscoverBox.vala:74 msgid "Support our work to keep improving our free applications." msgstr "" "Unterstützen Sie unsere Arbeit, um unsere kostenlosen Anwendungen zu " "verbessern." -#: ../src/UserInterface/Widgets/DiscoverBox.vala:76 -#: ../src/UserInterface/Menus/ApplicationMenu.vala:47 -msgid "Donate" -msgstr "Spenden" +#: src/UserInterface/Dialogs/StationDialog.vala:60 +#: src/UserInterface/Dialogs/ErrorDialog.vala:55 +msgid "Close" +msgstr "Schließen" -#: ../src/UserInterface/Widgets/GenresTreeView.vala:58 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:76 -msgid "Genre" -msgstr "Genre" +#: src/UserInterface/Dialogs/StationDialog.vala:116 +msgid "Name" +msgstr "Name" -#: ../src/UserInterface/Widgets/StationsTreeView.vala:75 -msgid "Station" -msgstr "Sender" +#: src/UserInterface/Dialogs/AddStationDialog.vala:33 +msgid "Add Station" +msgstr "Sender hinzufügen" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 -msgid "Add to Favorites" -msgstr "Zu den Favoriten hinzufügen" +#: src/UserInterface/Dialogs/EditStationDialog.vala:35 +msgid "Update Details" +msgstr "Details aktualisieren" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 -msgid "Edit station info" -msgstr "Senderliste bearbeiten" +#: src/UserInterface/Dialogs/ErrorDialog.vala:56 +msgid "Report a bug" +msgstr "Problem melden" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 -msgid "Remove from Library" -msgstr "Aus der Sammlung entfernen" +#: src/UserInterface/Dialogs/ErrorDialog.vala:67 +msgid "A problem occured while inserting station to database." +msgstr "" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 -msgid "Remove from Favorites" -msgstr "Aus den Favoriten entfernen" +#: src/UserInterface/Dialogs/ErrorDialog.vala:76 +msgid "" +"If you believe this is a bug please report it to help us improve our " +"software." +msgstr "" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:43 -msgid "Add New Station" -msgstr "Neuen Sender hinzufügen" +#: src/UserInterface/Dialogs/ImportProgressDialog.vala:42 +msgid "Importing stations, please wait." +msgstr "Sender werden importiert, bitte warten." -#: ../src/UserInterface/Menus/ApplicationMenu.vala:44 -msgid "Backup" -msgstr "Sicherung" +#: src/UserInterface/Others/FileChooserCreator.vala:24 +msgid "Import Radio Stations Package" +msgstr "Radiosender Paket importieren" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:45 -msgid "Import Stations" -msgstr "Sender importieren" +#: src/UserInterface/Others/FileChooserCreator.vala:26 +#: src/UserInterface/Others/FileChooserCreator.vala:48 +msgid "Cancel" +msgstr "Abbrechen" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:46 -msgid "Export Stations" -msgstr "Sender exportieren" +#: src/UserInterface/Others/FileChooserCreator.vala:27 +msgid "Open" +msgstr "Öffnen" -#~ msgid "Radio Station Changed" -#~ msgstr "Radiosender wechseln" +#: src/UserInterface/Others/FileChooserCreator.vala:40 +#: src/UserInterface/Others/FileChooserCreator.vala:62 +msgid "eRadio Package" +msgstr "eRadio Paket" + +#: src/UserInterface/Others/FileChooserCreator.vala:46 +msgid "Export Radio Stations" +msgstr "Radiosender exportieren" + +#: src/UserInterface/Others/FileChooserCreator.vala:49 +msgid "Save" +msgstr "Speichern" diff --git a/po/el.po b/po/el.po index 4766b3e..acd938f 100644 --- a/po/el.po +++ b/po/el.po @@ -1,179 +1,227 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Greek translations for com.github.dreamdevel.eradio package. +# Copyright (C) 2019 THE com.github.dreamdevel.eradio'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.dreamdevel.eradio package. +# Automatically generated, 2019. # msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: com.github.dreamdevel.eradio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-11 16:37+0300\n" -"PO-Revision-Date: 2016-10-11 16:44+0300\n" -"Last-Translator: \n" -"Language-Team: \n" +"POT-Creation-Date: 2020-01-11 18:45+0100\n" +"PO-Revision-Date: 2019-04-22 13:32+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 -msgid "Add to Favorites" -msgstr "Προσθήκη στα Αγαπημένα" - -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 -msgid "Edit station info" -msgstr "Επεξεργασία" - -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 -msgid "Remove from Library" -msgstr "Διαγραφή" +#: src/Core/MPRIS.vala:187 src/UserInterface/Widgets/StationsListStore.vala:111 +#: src/UserInterface/Widgets/StationsListStore.vala:173 +msgid "Unknown" +msgstr "" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 -msgid "Remove from Favorites" -msgstr "Αφαίρεση από Αγαπημένα" +#: src/Core/Notifier.vala:37 +msgid "You are listening to." +msgstr "" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:43 +#: src/UserInterface/Menus/ApplicationMenu.vala:43 msgid "Add New Station" msgstr "Προσθήκη Νέου Σταθμού" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:44 +#: src/UserInterface/Menus/ApplicationMenu.vala:44 msgid "Backup" msgstr "Αντίγραφο Ασφαλείας" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:45 +#: src/UserInterface/Menus/ApplicationMenu.vala:45 msgid "Import Stations" msgstr "Εισαγωγή Σταθμών" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:46 +#: src/UserInterface/Menus/ApplicationMenu.vala:46 msgid "Export Stations" msgstr "Εξαγωγή Σταθμών" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:47 -#: ../src/UserInterface/Widgets/DiscoverBox.vala:72 +#: src/UserInterface/Menus/ApplicationMenu.vala:47 +#: src/UserInterface/Widgets/DiscoverBox.vala:77 msgid "Donate" msgstr "Κάντε Δωρεά" -#: ../src/UserInterface/Views/WelcomeView.vala:26 +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 +msgid "Add to Favorites" +msgstr "Προσθήκη στα Αγαπημένα" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 +msgid "Edit station info" +msgstr "Επεξεργασία" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 +msgid "Remove from Library" +msgstr "Διαγραφή" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 +msgid "Remove from Favorites" +msgstr "Αφαίρεση από Αγαπημένα" + +#: src/UserInterface/Views/WelcomeView.vala:26 msgid "Add a station to begin listening" msgstr "Προσθέστε σταθμό για να ξεκινήσετε την ακρόαση" -#: ../src/UserInterface/Views/WelcomeView.vala:44 +#: src/UserInterface/Views/WelcomeView.vala:44 msgid "Add" msgstr "Προσθήκη" -#: ../src/UserInterface/Views/WelcomeView.vala:44 +#: src/UserInterface/Views/WelcomeView.vala:44 msgid "Add a new station." msgstr "Προσθήκη νέου σταθμού." -#: ../src/UserInterface/Views/WelcomeView.vala:45 +#: src/UserInterface/Views/WelcomeView.vala:45 msgid "Import" msgstr "Εισαγωγή" -#: ../src/UserInterface/Views/WelcomeView.vala:45 +#: src/UserInterface/Views/WelcomeView.vala:45 msgid "Import stations from eradio package." msgstr "Εισαγωγή σταθμών από πακέτο eradio." -#: ../src/UserInterface/Others/FileChooserCreator.vala:24 -msgid "Import Radio Stations Package" -msgstr "Εισαγωγή πακέτου σταθμών" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:26 -#: ../src/UserInterface/Others/FileChooserCreator.vala:48 -msgid "Cancel" -msgstr "Άκυρο" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:27 -msgid "Open" -msgstr "Άνοιγμα" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:40 -#: ../src/UserInterface/Others/FileChooserCreator.vala:62 -msgid "eRadio Package" -msgstr "Πακέτο eRadio" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:46 -msgid "Export Radio Stations" -msgstr "Εξαγωγή Σταθμών" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:49 -msgid "Save" -msgstr "Αποθήκευση" +#: src/UserInterface/Widgets/HeaderBar.vala:62 +msgid "Play" +msgstr "" -#: ../src/UserInterface/Dialogs/ImportProgressDialog.vala:42 -msgid "Importing stations, please wait." -msgstr "Εισαγωγή σταθμών, παρακαλώ περιμένετε." +#: src/UserInterface/Widgets/HeaderBar.vala:64 +msgid "Next Station" +msgstr "" -#: ../src/UserInterface/Dialogs/AddStationDialog.vala:33 -msgid "Add Station" -msgstr "Προσθήκη Σταθμού" +#: src/UserInterface/Widgets/HeaderBar.vala:66 +msgid "Previous Station" +msgstr "" -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:55 -#: ../src/UserInterface/Dialogs/StationDialog.vala:60 -msgid "Close" -msgstr "Κλείσιμο" +#: src/UserInterface/Widgets/HeaderBar.vala:96 +msgid "Menu" +msgstr "" -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:56 -msgid "Report a bug" -msgstr "Αναφέρετε κάποιο σφάλμα" +#: src/UserInterface/Widgets/HeaderBar.vala:197 +msgid "Pause" +msgstr "" -#: ../src/UserInterface/Dialogs/StationDialog.vala:90 -#: ../src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Dialogs/StationDialog.vala:90 msgid "Genres" msgstr "Είδη" -#: ../src/UserInterface/Dialogs/StationDialog.vala:116 -msgid "Name" -msgstr "Όνομα" +#: src/UserInterface/Widgets/SideBar.vala:66 +#: src/UserInterface/Widgets/StationsListStore.vala:258 +msgid "All Stations" +msgstr "Όλοι οι Σταθμοί" -#: ../src/UserInterface/Dialogs/StationDialog.vala:117 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:77 -msgid "Url" -msgstr "Σύνδεσμος" +#: src/UserInterface/Widgets/SideBar.vala:79 +#: src/UserInterface/Widgets/StationsListStore.vala:260 +msgid "Favorites" +msgstr "Αγαπημένα" -#: ../src/UserInterface/Dialogs/EditStationDialog.vala:35 -msgid "Update Station" -msgstr "Ανανέωση Σταθμού" +#: src/UserInterface/Widgets/SideBar.vala:91 +#: src/UserInterface/Widgets/StationsListStore.vala:262 +#: src/UserInterface/Widgets/DiscoverBox.vala:67 +#: src/UserInterface/Widgets/MainStack.vala:61 +msgid "Discover" +msgstr "Ανακάλυψη" -#: ../src/UserInterface/Widgets/StationsTreeView.vala:75 +#: src/UserInterface/Widgets/StationsTreeView.vala:76 msgid "Station" msgstr "Σταθμός" -#: ../src/UserInterface/Widgets/StationsTreeView.vala:76 -#: ../src/UserInterface/Widgets/GenresTreeView.vala:58 +#: src/UserInterface/Widgets/StationsTreeView.vala:77 +#: src/UserInterface/Widgets/GenresTreeView.vala:58 msgid "Genre" msgstr "Είδος" -#: ../src/UserInterface/Widgets/SideBar.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:213 -msgid "All Stations" -msgstr "Όλοι οι Σταθμοί" +#: src/UserInterface/Widgets/StationsTreeView.vala:78 +#: src/UserInterface/Dialogs/StationDialog.vala:117 +msgid "Url" +msgstr "Σύνδεσμος" -#: ../src/UserInterface/Widgets/SideBar.vala:79 -#: ../src/UserInterface/Widgets/StationsListStore.vala:215 -msgid "Favorites" -msgstr "Αγαπημένα" +#: src/UserInterface/Widgets/GenresListStore.vala:25 +msgid "New Genre" +msgstr "" -#: ../src/UserInterface/Widgets/SideBar.vala:91 -#: ../src/UserInterface/Widgets/DiscoverBox.vala:62 -#: ../src/UserInterface/Widgets/StationsListStore.vala:217 -msgid "Discover" -msgstr "Ανακάλυψη" +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:66 +msgid "Add Genre" +msgstr "" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:70 +msgid "Remove Genre" +msgstr "" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:64 +#: src/UserInterface/Widgets/DiscoverBox.vala:69 msgid "Find new radio stations instantly" msgstr "Βρείτε νέους ραδιοφωνικούς σταθμούς άμεσα" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:67 +#: src/UserInterface/Widgets/DiscoverBox.vala:72 msgid "This feature is currently not implemented." msgstr "Αυτή η λειτουργία δεν έχει ακόμη υλοποιηθεί." -#: ../src/UserInterface/Widgets/DiscoverBox.vala:69 +#: src/UserInterface/Widgets/DiscoverBox.vala:74 msgid "Support our work to keep improving our free applications." -msgstr "Υποστηρίξτε μας για να συνεχίσουμε να βελτιώνουμε τις δωρεάν εφαρμογές μας" +msgstr "" +"Υποστηρίξτε μας για να συνεχίσουμε να βελτιώνουμε τις δωρεάν εφαρμογές μας" + +#: src/UserInterface/Dialogs/StationDialog.vala:60 +#: src/UserInterface/Dialogs/ErrorDialog.vala:55 +msgid "Close" +msgstr "Κλείσιμο" + +#: src/UserInterface/Dialogs/StationDialog.vala:116 +msgid "Name" +msgstr "Όνομα" + +#: src/UserInterface/Dialogs/AddStationDialog.vala:33 +msgid "Add Station" +msgstr "Προσθήκη Σταθμού" + +#: src/UserInterface/Dialogs/EditStationDialog.vala:35 +msgid "Update Details" +msgstr "" + +#: src/UserInterface/Dialogs/ErrorDialog.vala:56 +msgid "Report a bug" +msgstr "Αναφέρετε κάποιο σφάλμα" + +#: src/UserInterface/Dialogs/ErrorDialog.vala:67 +msgid "A problem occured while inserting station to database." +msgstr "" + +#: src/UserInterface/Dialogs/ErrorDialog.vala:76 +msgid "" +"If you believe this is a bug please report it to help us improve our " +"software." +msgstr "" + +#: src/UserInterface/Dialogs/ImportProgressDialog.vala:42 +msgid "Importing stations, please wait." +msgstr "Εισαγωγή σταθμών, παρακαλώ περιμένετε." + +#: src/UserInterface/Others/FileChooserCreator.vala:24 +msgid "Import Radio Stations Package" +msgstr "Εισαγωγή πακέτου σταθμών" -#: ../src/Core/Notifier.vala:47 -msgid "Radio Station Changed" -msgstr "Ο σταθμός άλλαξε" +#: src/UserInterface/Others/FileChooserCreator.vala:26 +#: src/UserInterface/Others/FileChooserCreator.vala:48 +msgid "Cancel" +msgstr "Άκυρο" + +#: src/UserInterface/Others/FileChooserCreator.vala:27 +msgid "Open" +msgstr "Άνοιγμα" + +#: src/UserInterface/Others/FileChooserCreator.vala:40 +#: src/UserInterface/Others/FileChooserCreator.vala:62 +msgid "eRadio Package" +msgstr "Πακέτο eRadio" + +#: src/UserInterface/Others/FileChooserCreator.vala:46 +msgid "Export Radio Stations" +msgstr "Εξαγωγή Σταθμών" + +#: src/UserInterface/Others/FileChooserCreator.vala:49 +msgid "Save" +msgstr "Αποθήκευση" diff --git a/po/eradio.pot b/po/eradio.pot deleted file mode 100644 index bd2ca14..0000000 --- a/po/eradio.pot +++ /dev/null @@ -1,183 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-25 12:52+0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../src/Core/Notifier.vala:37 -msgid "You are listening to." -msgstr "" - -#: ../src/UserInterface/Views/WelcomeView.vala:26 -msgid "Add a station to begin listening" -msgstr "" - -#: ../src/UserInterface/Views/WelcomeView.vala:44 -msgid "Add" -msgstr "" - -#: ../src/UserInterface/Views/WelcomeView.vala:44 -msgid "Add a new station." -msgstr "" - -#: ../src/UserInterface/Views/WelcomeView.vala:45 -msgid "Import" -msgstr "" - -#: ../src/UserInterface/Views/WelcomeView.vala:45 -msgid "Import stations from eradio package." -msgstr "" - -#: ../src/UserInterface/Dialogs/EditStationDialog.vala:35 -msgid "Update Details" -msgstr "" - -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:55 -#: ../src/UserInterface/Dialogs/StationDialog.vala:60 -msgid "Close" -msgstr "" - -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:56 -msgid "Report a bug" -msgstr "" - -#: ../src/UserInterface/Dialogs/ImportProgressDialog.vala:42 -msgid "Importing stations, please wait." -msgstr "" - -#: ../src/UserInterface/Dialogs/AddStationDialog.vala:33 -msgid "Add Station" -msgstr "" - -#: ../src/UserInterface/Dialogs/StationDialog.vala:90 -#: ../src/UserInterface/Widgets/SideBar.vala:56 -msgid "Genres" -msgstr "" - -#: ../src/UserInterface/Dialogs/StationDialog.vala:116 -msgid "Name" -msgstr "" - -#: ../src/UserInterface/Dialogs/StationDialog.vala:117 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:77 -msgid "Url" -msgstr "" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:24 -msgid "Import Radio Stations Package" -msgstr "" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:26 -#: ../src/UserInterface/Others/FileChooserCreator.vala:48 -msgid "Cancel" -msgstr "" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:27 -msgid "Open" -msgstr "" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:40 -#: ../src/UserInterface/Others/FileChooserCreator.vala:62 -msgid "eRadio Package" -msgstr "" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:46 -msgid "Export Radio Stations" -msgstr "" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:49 -msgid "Save" -msgstr "" - -#: ../src/UserInterface/Widgets/SideBar.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:215 -msgid "All Stations" -msgstr "" - -#: ../src/UserInterface/Widgets/SideBar.vala:79 -#: ../src/UserInterface/Widgets/StationsListStore.vala:217 -msgid "Favorites" -msgstr "" - -#: ../src/UserInterface/Widgets/SideBar.vala:91 -#: ../src/UserInterface/Widgets/DiscoverBox.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:219 -#: ../src/UserInterface/Widgets/MainStack.vala:61 -msgid "Discover" -msgstr "" - -#: ../src/UserInterface/Widgets/GenresListStore.vala:25 -msgid "New Genre" -msgstr "" - -#: ../src/UserInterface/Widgets/DiscoverBox.vala:68 -msgid "Find new radio stations instantly" -msgstr "" - -#: ../src/UserInterface/Widgets/DiscoverBox.vala:71 -msgid "This feature is currently not implemented." -msgstr "" - -#: ../src/UserInterface/Widgets/DiscoverBox.vala:73 -msgid "Support our work to keep improving our free applications." -msgstr "" - -#: ../src/UserInterface/Widgets/DiscoverBox.vala:76 -#: ../src/UserInterface/Menus/ApplicationMenu.vala:47 -msgid "Donate" -msgstr "" - -#: ../src/UserInterface/Widgets/GenresTreeView.vala:58 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:76 -msgid "Genre" -msgstr "" - -#: ../src/UserInterface/Widgets/StationsTreeView.vala:75 -msgid "Station" -msgstr "" - -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 -msgid "Add to Favorites" -msgstr "" - -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 -msgid "Edit station info" -msgstr "" - -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 -msgid "Remove from Library" -msgstr "" - -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 -msgid "Remove from Favorites" -msgstr "" - -#: ../src/UserInterface/Menus/ApplicationMenu.vala:43 -msgid "Add New Station" -msgstr "" - -#: ../src/UserInterface/Menus/ApplicationMenu.vala:44 -msgid "Backup" -msgstr "" - -#: ../src/UserInterface/Menus/ApplicationMenu.vala:45 -msgid "Import Stations" -msgstr "" - -#: ../src/UserInterface/Menus/ApplicationMenu.vala:46 -msgid "Export Stations" -msgstr "" diff --git a/po/extra/LINGUAS b/po/extra/LINGUAS new file mode 100644 index 0000000..527e861 --- /dev/null +++ b/po/extra/LINGUAS @@ -0,0 +1 @@ +fr diff --git a/po/extra/POTFILES b/po/extra/POTFILES new file mode 100644 index 0000000..072de0e --- /dev/null +++ b/po/extra/POTFILES @@ -0,0 +1,2 @@ +data/com.github.dreamdevel.eradio.desktop.in +data/com.github.dreamdevel.eradio.appdata.xml.in \ No newline at end of file diff --git a/po/extra/extra.pot b/po/extra/extra.pot new file mode 100644 index 0000000..d9181b8 --- /dev/null +++ b/po/extra/extra.pot @@ -0,0 +1,63 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the extra package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: extra\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-01-11 18:44+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: data/com.github.dreamdevel.eradio.desktop.in:3 +#: data/com.github.dreamdevel.eradio.appdata.xml.in:7 +msgid "eRadio" +msgstr "" + +#: data/com.github.dreamdevel.eradio.desktop.in:4 +msgid "Radio Player" +msgstr "" + +#: data/com.github.dreamdevel.eradio.desktop.in:5 +msgid "Stream online radio stations" +msgstr "" + +#: data/com.github.dreamdevel.eradio.desktop.in:8 +msgid "com.github.dreamdevel.eradio" +msgstr "" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:8 +msgid "A minimalist and powerful radio player" +msgstr "" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:10 +msgid "" +"eRadio is a radio player with native desktop features such as: Sound " +"indicator integration, Media Keys Support, Notifications." +msgstr "" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:11 +msgid "" +"It support many stream types including m3u, pls, asx and has a webradio URI " +"scheme to easily add new stations from your internet browser" +msgstr "" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:12 +msgid "You can also backup and import radio stations via erpkg files" +msgstr "" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:20 +msgid "Initial release for elementary Juno" +msgstr "" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:58 +msgid "Dream Development" +msgstr "" diff --git a/po/extra/fr.po b/po/extra/fr.po new file mode 100644 index 0000000..8f23978 --- /dev/null +++ b/po/extra/fr.po @@ -0,0 +1,74 @@ +# French translations for extra package. +# Copyright (C) 2019 THE extra'S COPYRIGHT HOLDER +# This file is distributed under the same license as the extra package. +# NathanBnm, 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: extra\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-01-11 18:44+0100\n" +"PO-Revision-Date: 2019-04-22 16:45+0200\n" +"Last-Translator: NathanBnm\n" +"Language-Team: none\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: data/com.github.dreamdevel.eradio.desktop.in:3 +#: data/com.github.dreamdevel.eradio.appdata.xml.in:7 +msgid "eRadio" +msgstr "eRadio" + +#: data/com.github.dreamdevel.eradio.desktop.in:4 +msgid "Radio Player" +msgstr "Lecteur de radio" + +#: data/com.github.dreamdevel.eradio.desktop.in:5 +msgid "Stream online radio stations" +msgstr "Écoutez des stations de radio en ligne" + +#: data/com.github.dreamdevel.eradio.desktop.in:8 +msgid "com.github.dreamdevel.eradio" +msgstr "com.github.dreamdevel.eradio" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:8 +msgid "A minimalist and powerful radio player" +msgstr "Un lecteur de radio minimaliste et puissant" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:10 +msgid "" +"eRadio is a radio player with native desktop features such as: Sound " +"indicator integration, Media Keys Support, Notifications." +msgstr "" +"eRadio est un lecteur de radio avec des fonctionnalités d'intégration du " +"bureau natuves comme l'indicateur de volume, la prise en charge des touches " +"de média et les notifications." + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:11 +msgid "" +"It support many stream types including m3u, pls, asx and has a webradio URI " +"scheme to easily add new stations from your internet browser" +msgstr "" +"L'application prend en charge divers formats incluant le M3U, le PLS et " +"l'ASX et possède un schéma de reconaissance des webradios pour ajouter de " +"nouvelles stations directement depuis votre navigateur web" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:12 +msgid "You can also backup and import radio stations via erpkg files" +msgstr "" +"Vous pouvez aussi sauvegarder et importer des stations de radio à l'aide de " +"fichiers ERPKG" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:20 +msgid "Initial release for elementary Juno" +msgstr "" + +#: data/com.github.dreamdevel.eradio.appdata.xml.in:58 +msgid "Dream Development" +msgstr "Dream Development" + +#~ msgid "About eRadio" +#~ msgstr "À propos d'eRadio" diff --git a/po/extra/meson.build b/po/extra/meson.build new file mode 100644 index 0000000..891039a --- /dev/null +++ b/po/extra/meson.build @@ -0,0 +1,7 @@ +i18n.gettext('extra', + args: [ + '--directory=' + meson.source_root(), + '--from-code=UTF-8' + ], + install: false +) \ No newline at end of file diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 0000000..843bb6d --- /dev/null +++ b/po/fr.po @@ -0,0 +1,234 @@ +# French translations for com.github.dreamdevel.eradio package. +# Copyright (C) 2019 THE com.github.dreamdevel.eradio'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.dreamdevel.eradio package. +# NathanBnm, 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: com.github.dreamdevel.eradio\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-01-11 18:45+0100\n" +"PO-Revision-Date: 2019-04-22 16:44+0200\n" +"Last-Translator: NathanBnm\n" +"Language-Team: none\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: src/Core/MPRIS.vala:187 src/UserInterface/Widgets/StationsListStore.vala:111 +#: src/UserInterface/Widgets/StationsListStore.vala:173 +msgid "Unknown" +msgstr "Inconnu" + +#: src/Core/Notifier.vala:37 +msgid "You are listening to." +msgstr "Vous êtes en train d'écouter" + +#: src/UserInterface/Menus/ApplicationMenu.vala:43 +msgid "Add New Station" +msgstr "Ajouter une nouvelle station" + +#: src/UserInterface/Menus/ApplicationMenu.vala:44 +msgid "Backup" +msgstr "Sauvegarde" + +#: src/UserInterface/Menus/ApplicationMenu.vala:45 +msgid "Import Stations" +msgstr "Importer des stations" + +#: src/UserInterface/Menus/ApplicationMenu.vala:46 +msgid "Export Stations" +msgstr "Exporter des stations" + +#: src/UserInterface/Menus/ApplicationMenu.vala:47 +#: src/UserInterface/Widgets/DiscoverBox.vala:77 +msgid "Donate" +msgstr "Soutenir" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 +msgid "Add to Favorites" +msgstr "Ajouter aux favoris" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 +msgid "Edit station info" +msgstr "Modifier les informations sur la station" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 +msgid "Remove from Library" +msgstr "Supprimer de la bibliothèque" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 +msgid "Remove from Favorites" +msgstr "Supprimer des favoris" + +#: src/UserInterface/Views/WelcomeView.vala:26 +msgid "Add a station to begin listening" +msgstr "Ajoutez une station pour commencer à écouter" + +#: src/UserInterface/Views/WelcomeView.vala:44 +msgid "Add" +msgstr "Ajouter" + +#: src/UserInterface/Views/WelcomeView.vala:44 +msgid "Add a new station." +msgstr "Ajouter une nouvelle station." + +#: src/UserInterface/Views/WelcomeView.vala:45 +msgid "Import" +msgstr "Importer" + +#: src/UserInterface/Views/WelcomeView.vala:45 +msgid "Import stations from eradio package." +msgstr "Importer des stations à partir d'un paquet eradio." + +#: src/UserInterface/Widgets/HeaderBar.vala:62 +msgid "Play" +msgstr "Lecture" + +#: src/UserInterface/Widgets/HeaderBar.vala:64 +msgid "Next Station" +msgstr "Station suivante" + +#: src/UserInterface/Widgets/HeaderBar.vala:66 +msgid "Previous Station" +msgstr "Station précédente" + +#: src/UserInterface/Widgets/HeaderBar.vala:96 +msgid "Menu" +msgstr "Menu" + +#: src/UserInterface/Widgets/HeaderBar.vala:197 +msgid "Pause" +msgstr "Pause" + +#: src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Dialogs/StationDialog.vala:90 +msgid "Genres" +msgstr "Genres" + +#: src/UserInterface/Widgets/SideBar.vala:66 +#: src/UserInterface/Widgets/StationsListStore.vala:258 +msgid "All Stations" +msgstr "Toutes les stations" + +#: src/UserInterface/Widgets/SideBar.vala:79 +#: src/UserInterface/Widgets/StationsListStore.vala:260 +msgid "Favorites" +msgstr "Favoris" + +#: src/UserInterface/Widgets/SideBar.vala:91 +#: src/UserInterface/Widgets/StationsListStore.vala:262 +#: src/UserInterface/Widgets/DiscoverBox.vala:67 +#: src/UserInterface/Widgets/MainStack.vala:61 +msgid "Discover" +msgstr "Découvrir" + +#: src/UserInterface/Widgets/StationsTreeView.vala:76 +msgid "Station" +msgstr "Station" + +#: src/UserInterface/Widgets/StationsTreeView.vala:77 +#: src/UserInterface/Widgets/GenresTreeView.vala:58 +msgid "Genre" +msgstr "Genre" + +#: src/UserInterface/Widgets/StationsTreeView.vala:78 +#: src/UserInterface/Dialogs/StationDialog.vala:117 +msgid "Url" +msgstr "URL" + +#: src/UserInterface/Widgets/GenresListStore.vala:25 +msgid "New Genre" +msgstr "Nouveau genre" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:66 +msgid "Add Genre" +msgstr "Ajouter un genre" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:70 +msgid "Remove Genre" +msgstr "Supprimer le genre" + +#: src/UserInterface/Widgets/DiscoverBox.vala:69 +msgid "Find new radio stations instantly" +msgstr "Trouvez de nouvelles stations de radio en un instant" + +#: src/UserInterface/Widgets/DiscoverBox.vala:72 +msgid "This feature is currently not implemented." +msgstr "Cette fonctionnalité n'est pour le moment pas implémentée." + +#: src/UserInterface/Widgets/DiscoverBox.vala:74 +msgid "Support our work to keep improving our free applications." +msgstr "" +"Soutenez notre travail pour continuer d'améliorer nos applications gratuites." + +#: src/UserInterface/Dialogs/StationDialog.vala:60 +#: src/UserInterface/Dialogs/ErrorDialog.vala:55 +msgid "Close" +msgstr "Fermer" + +#: src/UserInterface/Dialogs/StationDialog.vala:116 +msgid "Name" +msgstr "Nom" + +#: src/UserInterface/Dialogs/AddStationDialog.vala:33 +msgid "Add Station" +msgstr "Ajouter la station" + +#: src/UserInterface/Dialogs/EditStationDialog.vala:35 +msgid "Update Details" +msgstr "Mettre à jour" + +#: src/UserInterface/Dialogs/ErrorDialog.vala:56 +msgid "Report a bug" +msgstr "Signaler un bug" + +#: src/UserInterface/Dialogs/ErrorDialog.vala:67 +msgid "A problem occured while inserting station to database." +msgstr "" +"Une erreur s'est produite lors de l'ajout de la station dans la base de " +"données." + +#: src/UserInterface/Dialogs/ErrorDialog.vala:76 +msgid "" +"If you believe this is a bug please report it to help us improve our " +"software." +msgstr "" +"Si vous pensez qu'il s'agit d'un bug, veuillez le signaler pour nous aider " +"àaméliorer notre logiciel." + +#: src/UserInterface/Dialogs/ImportProgressDialog.vala:42 +msgid "Importing stations, please wait." +msgstr "Importation des stations, veuillez patienter." + +#: src/UserInterface/Others/FileChooserCreator.vala:24 +msgid "Import Radio Stations Package" +msgstr "Importer un paquet de stations de radio" + +#: src/UserInterface/Others/FileChooserCreator.vala:26 +#: src/UserInterface/Others/FileChooserCreator.vala:48 +msgid "Cancel" +msgstr "Annuler" + +#: src/UserInterface/Others/FileChooserCreator.vala:27 +msgid "Open" +msgstr "Ouvrir" + +#: src/UserInterface/Others/FileChooserCreator.vala:40 +#: src/UserInterface/Others/FileChooserCreator.vala:62 +msgid "eRadio Package" +msgstr "Paquet eRadio" + +#: src/UserInterface/Others/FileChooserCreator.vala:46 +msgid "Export Radio Stations" +msgstr "Exporter des stations de radio" + +#: src/UserInterface/Others/FileChooserCreator.vala:49 +msgid "Save" +msgstr "Enregistrer" + +#~ msgid "Next" +#~ msgstr "Suivant" diff --git a/po/hu.po b/po/hu.po index 2cb92b3..2312ac6 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,183 +1,228 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , 2017. +# Hungarian translations for com.github.dreamdevel.eradio package. +# Copyright (C) 2019 THE com.github.dreamdevel.eradio'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.dreamdevel.eradio package. +# Automatically generated, 2019. # msgid "" msgstr "" -"Project-Id-Version: eRadio\n" +"Project-Id-Version: com.github.dreamdevel.eradio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-25 12:52+0300\n" -"PO-Revision-Date: 2017-04-15 20:11+0200\n" +"POT-Creation-Date: 2020-01-11 18:45+0100\n" +"PO-Revision-Date: 2019-04-22 13:32+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Last-Translator: \n" -"Language-Team: Laszlo Espadas \n" -"X-Generator: Poedit 1.8.7.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/Core/Notifier.vala:37 +#: src/Core/MPRIS.vala:187 src/UserInterface/Widgets/StationsListStore.vala:111 +#: src/UserInterface/Widgets/StationsListStore.vala:173 +msgid "Unknown" +msgstr "" + +#: src/Core/Notifier.vala:37 msgid "You are listening to." msgstr "Ezt hallgatja most." -#: ../src/UserInterface/Views/WelcomeView.vala:26 +#: src/UserInterface/Menus/ApplicationMenu.vala:43 +msgid "Add New Station" +msgstr "Új állomás hozzáadása" + +#: src/UserInterface/Menus/ApplicationMenu.vala:44 +msgid "Backup" +msgstr "Biztonsági mentés" + +#: src/UserInterface/Menus/ApplicationMenu.vala:45 +msgid "Import Stations" +msgstr "Állomások importálása" + +#: src/UserInterface/Menus/ApplicationMenu.vala:46 +msgid "Export Stations" +msgstr "Állomások exportálása" + +#: src/UserInterface/Menus/ApplicationMenu.vala:47 +#: src/UserInterface/Widgets/DiscoverBox.vala:77 +msgid "Donate" +msgstr "Támogatás" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 +msgid "Add to Favorites" +msgstr "Hozzáadás a kedvencekhez" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 +msgid "Edit station info" +msgstr "Állomás információk szerkesztése" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 +msgid "Remove from Library" +msgstr "Eltávolítás a könyvtárból" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 +msgid "Remove from Favorites" +msgstr "Eltávolítás a kedvencek közül" + +#: src/UserInterface/Views/WelcomeView.vala:26 msgid "Add a station to begin listening" msgstr "Állomás hozzáadása a hallgatáshoz" -#: ../src/UserInterface/Views/WelcomeView.vala:44 +#: src/UserInterface/Views/WelcomeView.vala:44 msgid "Add" msgstr "Hozzáadás\t" -#: ../src/UserInterface/Views/WelcomeView.vala:44 +#: src/UserInterface/Views/WelcomeView.vala:44 msgid "Add a new station." msgstr "Új állomás" -#: ../src/UserInterface/Views/WelcomeView.vala:45 +#: src/UserInterface/Views/WelcomeView.vala:45 msgid "Import" msgstr "Importálás" -#: ../src/UserInterface/Views/WelcomeView.vala:45 +#: src/UserInterface/Views/WelcomeView.vala:45 msgid "Import stations from eradio package." msgstr "eRadio csomag állomások importálása" -#: ../src/UserInterface/Dialogs/EditStationDialog.vala:35 -msgid "Update Details" -msgstr "Részletek frissítése" +#: src/UserInterface/Widgets/HeaderBar.vala:62 +msgid "Play" +msgstr "" -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:55 -#: ../src/UserInterface/Dialogs/StationDialog.vala:60 -msgid "Close" -msgstr "Bezárás" +#: src/UserInterface/Widgets/HeaderBar.vala:64 +msgid "Next Station" +msgstr "" -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:56 -msgid "Report a bug" -msgstr "Hibajelentés" +#: src/UserInterface/Widgets/HeaderBar.vala:66 +msgid "Previous Station" +msgstr "" -#: ../src/UserInterface/Dialogs/ImportProgressDialog.vala:42 -msgid "Importing stations, please wait." -msgstr "Állomások importálása, várjunk." +#: src/UserInterface/Widgets/HeaderBar.vala:96 +msgid "Menu" +msgstr "" -#: ../src/UserInterface/Dialogs/AddStationDialog.vala:33 -msgid "Add Station" -msgstr "Új állomás" +#: src/UserInterface/Widgets/HeaderBar.vala:197 +msgid "Pause" +msgstr "" -#: ../src/UserInterface/Dialogs/StationDialog.vala:90 -#: ../src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Dialogs/StationDialog.vala:90 msgid "Genres" msgstr "Műfaj" -#: ../src/UserInterface/Dialogs/StationDialog.vala:116 -msgid "Name" -msgstr "Név" - -#: ../src/UserInterface/Dialogs/StationDialog.vala:117 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:77 -msgid "Url" -msgstr "URL" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:24 -msgid "Import Radio Stations Package" -msgstr "Rádió állomások importálása csomag" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:26 -#: ../src/UserInterface/Others/FileChooserCreator.vala:48 -msgid "Cancel" -msgstr "Mégse" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:27 -msgid "Open" -msgstr "Megnyitás" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:40 -#: ../src/UserInterface/Others/FileChooserCreator.vala:62 -msgid "eRadio Package" -msgstr "eRadio csomag" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:46 -msgid "Export Radio Stations" -msgstr "Rádió állomások exportálása" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:49 -msgid "Save" -msgstr "Mentés" - -#: ../src/UserInterface/Widgets/SideBar.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:215 +#: src/UserInterface/Widgets/SideBar.vala:66 +#: src/UserInterface/Widgets/StationsListStore.vala:258 msgid "All Stations" msgstr "Összes állomás" -#: ../src/UserInterface/Widgets/SideBar.vala:79 -#: ../src/UserInterface/Widgets/StationsListStore.vala:217 +#: src/UserInterface/Widgets/SideBar.vala:79 +#: src/UserInterface/Widgets/StationsListStore.vala:260 msgid "Favorites" msgstr "Kedvencek" -#: ../src/UserInterface/Widgets/SideBar.vala:91 -#: ../src/UserInterface/Widgets/DiscoverBox.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:219 -#: ../src/UserInterface/Widgets/MainStack.vala:61 +#: src/UserInterface/Widgets/SideBar.vala:91 +#: src/UserInterface/Widgets/StationsListStore.vala:262 +#: src/UserInterface/Widgets/DiscoverBox.vala:67 +#: src/UserInterface/Widgets/MainStack.vala:61 msgid "Discover" msgstr "Felfedezés" -#: ../src/UserInterface/Widgets/GenresListStore.vala:25 +#: src/UserInterface/Widgets/StationsTreeView.vala:76 +msgid "Station" +msgstr "Állomás" + +#: src/UserInterface/Widgets/StationsTreeView.vala:77 +#: src/UserInterface/Widgets/GenresTreeView.vala:58 +msgid "Genre" +msgstr "Műfaj" + +#: src/UserInterface/Widgets/StationsTreeView.vala:78 +#: src/UserInterface/Dialogs/StationDialog.vala:117 +msgid "Url" +msgstr "URL" + +#: src/UserInterface/Widgets/GenresListStore.vala:25 msgid "New Genre" -msgstr "Új műfaj" +msgstr "" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:66 +msgid "Add Genre" +msgstr "" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:70 +msgid "Remove Genre" +msgstr "" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:68 +#: src/UserInterface/Widgets/DiscoverBox.vala:69 msgid "Find new radio stations instantly" msgstr "Keressen új rádióállomásokat azonnal" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:71 +#: src/UserInterface/Widgets/DiscoverBox.vala:72 msgid "This feature is currently not implemented." msgstr "Ez a funkció jelenleg nem érhező el" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:73 +#: src/UserInterface/Widgets/DiscoverBox.vala:74 msgid "Support our work to keep improving our free applications." -msgstr "Támogassa munkánkat, hogy inspiráljon minkez az ingyenes alkalmazások fejlesztésében." +msgstr "" +"Támogassa munkánkat, hogy inspiráljon minkez az ingyenes alkalmazások " +"fejlesztésében." -#: ../src/UserInterface/Widgets/DiscoverBox.vala:76 -#: ../src/UserInterface/Menus/ApplicationMenu.vala:47 -msgid "Donate" -msgstr "Támogatás" +#: src/UserInterface/Dialogs/StationDialog.vala:60 +#: src/UserInterface/Dialogs/ErrorDialog.vala:55 +msgid "Close" +msgstr "Bezárás" -#: ../src/UserInterface/Widgets/GenresTreeView.vala:58 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:76 -msgid "Genre" -msgstr "Műfaj" +#: src/UserInterface/Dialogs/StationDialog.vala:116 +msgid "Name" +msgstr "Név" -#: ../src/UserInterface/Widgets/StationsTreeView.vala:75 -msgid "Station" -msgstr "Állomás" +#: src/UserInterface/Dialogs/AddStationDialog.vala:33 +msgid "Add Station" +msgstr "Új állomás" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 -msgid "Add to Favorites" -msgstr "Hozzáadás a kedvencekhez" +#: src/UserInterface/Dialogs/EditStationDialog.vala:35 +msgid "Update Details" +msgstr "Részletek frissítése" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 -msgid "Edit station info" -msgstr "Állomás információk szerkesztése" +#: src/UserInterface/Dialogs/ErrorDialog.vala:56 +msgid "Report a bug" +msgstr "Hibajelentés" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 -msgid "Remove from Library" -msgstr "Eltávolítás a könyvtárból" +#: src/UserInterface/Dialogs/ErrorDialog.vala:67 +msgid "A problem occured while inserting station to database." +msgstr "" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 -msgid "Remove from Favorites" -msgstr "Eltávolítás a kedvencek közül" +#: src/UserInterface/Dialogs/ErrorDialog.vala:76 +msgid "" +"If you believe this is a bug please report it to help us improve our " +"software." +msgstr "" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:43 -msgid "Add New Station" -msgstr "Új állomás hozzáadása" +#: src/UserInterface/Dialogs/ImportProgressDialog.vala:42 +msgid "Importing stations, please wait." +msgstr "Állomások importálása, várjunk." -#: ../src/UserInterface/Menus/ApplicationMenu.vala:44 -msgid "Backup" -msgstr "Biztonsági mentés" +#: src/UserInterface/Others/FileChooserCreator.vala:24 +msgid "Import Radio Stations Package" +msgstr "Rádió állomások importálása csomag" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:45 -msgid "Import Stations" -msgstr "Állomások importálása" +#: src/UserInterface/Others/FileChooserCreator.vala:26 +#: src/UserInterface/Others/FileChooserCreator.vala:48 +msgid "Cancel" +msgstr "Mégse" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:46 -msgid "Export Stations" -msgstr "Állomások exportálása" +#: src/UserInterface/Others/FileChooserCreator.vala:27 +msgid "Open" +msgstr "Megnyitás" + +#: src/UserInterface/Others/FileChooserCreator.vala:40 +#: src/UserInterface/Others/FileChooserCreator.vala:62 +msgid "eRadio Package" +msgstr "eRadio csomag" + +#: src/UserInterface/Others/FileChooserCreator.vala:46 +msgid "Export Radio Stations" +msgstr "Rádió állomások exportálása" + +#: src/UserInterface/Others/FileChooserCreator.vala:49 +msgid "Save" +msgstr "Mentés" diff --git a/po/meson.build b/po/meson.build new file mode 100644 index 0000000..382a323 --- /dev/null +++ b/po/meson.build @@ -0,0 +1,8 @@ +i18n.gettext(meson.project_name(), + args: [ + '--directory=' + meson.source_root(), + '--from-code=UTF-8' + ] +) + +subdir('extra') \ No newline at end of file diff --git a/po/nl.po b/po/nl.po index 178e1fa..e517e74 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,183 +1,226 @@ -# Dutch translation for eradio -# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016 -# This file is distributed under the same license as the eradio package. -# FIRST AUTHOR , 2016. +# Dutch translations for com.github.dreamdevel.eradio package. +# Copyright (C) 2019 THE com.github.dreamdevel.eradio'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.dreamdevel.eradio package. +# Jonathan Moerman, 2019. # msgid "" msgstr "" -"Project-Id-Version: eradio\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2016-10-25 12:52+0300\n" -"PO-Revision-Date: 2016-10-29 07:32+0000\n" -"Last-Translator: Jonathan Moerman \n" -"Language-Team: Dutch \n" +"Project-Id-Version: com.github.dreamdevel.eradio\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-01-11 18:45+0100\n" +"PO-Revision-Date: 2019-04-22 13:32+0200\n" +"Last-Translator: Jonathan Moerman\n" +"Language-Team: none\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-10-31 14:56+0000\n" -"X-Generator: Launchpad (build 18246)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/Core/Notifier.vala:37 +#: src/Core/MPRIS.vala:187 src/UserInterface/Widgets/StationsListStore.vala:111 +#: src/UserInterface/Widgets/StationsListStore.vala:173 +msgid "Unknown" +msgstr "" + +#: src/Core/Notifier.vala:37 msgid "You are listening to." msgstr "Je luistert naar" -#: ../src/UserInterface/Views/WelcomeView.vala:26 +#: src/UserInterface/Menus/ApplicationMenu.vala:43 +msgid "Add New Station" +msgstr "Voeg nieuwe zender toe" + +#: src/UserInterface/Menus/ApplicationMenu.vala:44 +msgid "Backup" +msgstr "Maak een reservekopie" + +#: src/UserInterface/Menus/ApplicationMenu.vala:45 +msgid "Import Stations" +msgstr "Zenders importeren" + +#: src/UserInterface/Menus/ApplicationMenu.vala:46 +msgid "Export Stations" +msgstr "Zenders exporteren" + +#: src/UserInterface/Menus/ApplicationMenu.vala:47 +#: src/UserInterface/Widgets/DiscoverBox.vala:77 +msgid "Donate" +msgstr "Doneer" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 +msgid "Add to Favorites" +msgstr "Voeg toe aan Favorieten" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 +msgid "Edit station info" +msgstr "Bewerk zender informatie" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 +msgid "Remove from Library" +msgstr "Verwijder uit bibliotheek" + +#: src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 +msgid "Remove from Favorites" +msgstr "Verwijder uit favorieten" + +#: src/UserInterface/Views/WelcomeView.vala:26 msgid "Add a station to begin listening" msgstr "Voeg een radio zender toe en begin met luisteren" -#: ../src/UserInterface/Views/WelcomeView.vala:44 +#: src/UserInterface/Views/WelcomeView.vala:44 msgid "Add" msgstr "Toevoegen" -#: ../src/UserInterface/Views/WelcomeView.vala:44 +#: src/UserInterface/Views/WelcomeView.vala:44 msgid "Add a new station." msgstr "Voeg een nieuwe zender toe" -#: ../src/UserInterface/Views/WelcomeView.vala:45 +#: src/UserInterface/Views/WelcomeView.vala:45 msgid "Import" msgstr "Importeer" -#: ../src/UserInterface/Views/WelcomeView.vala:45 +#: src/UserInterface/Views/WelcomeView.vala:45 msgid "Import stations from eradio package." msgstr "Importeer zenders uit een eradio paket" -#: ../src/UserInterface/Dialogs/EditStationDialog.vala:35 -msgid "Update Details" -msgstr "Ververs details" +#: src/UserInterface/Widgets/HeaderBar.vala:62 +msgid "Play" +msgstr "" -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:55 -#: ../src/UserInterface/Dialogs/StationDialog.vala:60 -msgid "Close" -msgstr "Sluiten" +#: src/UserInterface/Widgets/HeaderBar.vala:64 +msgid "Next Station" +msgstr "" -#: ../src/UserInterface/Dialogs/ErrorDialog.vala:56 -msgid "Report a bug" -msgstr "Meld een fout" +#: src/UserInterface/Widgets/HeaderBar.vala:66 +msgid "Previous Station" +msgstr "" -#: ../src/UserInterface/Dialogs/ImportProgressDialog.vala:42 -msgid "Importing stations, please wait." -msgstr "Zenders aan het importeren, even geduld alstublieft." +#: src/UserInterface/Widgets/HeaderBar.vala:96 +msgid "Menu" +msgstr "" -#: ../src/UserInterface/Dialogs/AddStationDialog.vala:33 -msgid "Add Station" -msgstr "Zender Toevoegen" +#: src/UserInterface/Widgets/HeaderBar.vala:197 +msgid "Pause" +msgstr "" -#: ../src/UserInterface/Dialogs/StationDialog.vala:90 -#: ../src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Widgets/SideBar.vala:56 +#: src/UserInterface/Dialogs/StationDialog.vala:90 msgid "Genres" msgstr "Genres" -#: ../src/UserInterface/Dialogs/StationDialog.vala:116 -msgid "Name" -msgstr "Naam" - -#: ../src/UserInterface/Dialogs/StationDialog.vala:117 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:77 -msgid "Url" -msgstr "Url" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:24 -msgid "Import Radio Stations Package" -msgstr "Importeer radio zender paket" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:26 -#: ../src/UserInterface/Others/FileChooserCreator.vala:48 -msgid "Cancel" -msgstr "Annuleren" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:27 -msgid "Open" -msgstr "Openen" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:40 -#: ../src/UserInterface/Others/FileChooserCreator.vala:62 -msgid "eRadio Package" -msgstr "eRadio paket" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:46 -msgid "Export Radio Stations" -msgstr "Exporteer radio zenders" - -#: ../src/UserInterface/Others/FileChooserCreator.vala:49 -msgid "Save" -msgstr "Opslaan" - -#: ../src/UserInterface/Widgets/SideBar.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:215 +#: src/UserInterface/Widgets/SideBar.vala:66 +#: src/UserInterface/Widgets/StationsListStore.vala:258 msgid "All Stations" msgstr "Alle zenders" -#: ../src/UserInterface/Widgets/SideBar.vala:79 -#: ../src/UserInterface/Widgets/StationsListStore.vala:217 +#: src/UserInterface/Widgets/SideBar.vala:79 +#: src/UserInterface/Widgets/StationsListStore.vala:260 msgid "Favorites" msgstr "Favorieten" -#: ../src/UserInterface/Widgets/SideBar.vala:91 -#: ../src/UserInterface/Widgets/DiscoverBox.vala:66 -#: ../src/UserInterface/Widgets/StationsListStore.vala:219 -#: ../src/UserInterface/Widgets/MainStack.vala:61 +#: src/UserInterface/Widgets/SideBar.vala:91 +#: src/UserInterface/Widgets/StationsListStore.vala:262 +#: src/UserInterface/Widgets/DiscoverBox.vala:67 +#: src/UserInterface/Widgets/MainStack.vala:61 msgid "Discover" msgstr "Ontdek" -#: ../src/UserInterface/Widgets/GenresListStore.vala:25 +#: src/UserInterface/Widgets/StationsTreeView.vala:76 +msgid "Station" +msgstr "Zender" + +#: src/UserInterface/Widgets/StationsTreeView.vala:77 +#: src/UserInterface/Widgets/GenresTreeView.vala:58 +msgid "Genre" +msgstr "Genre" + +#: src/UserInterface/Widgets/StationsTreeView.vala:78 +#: src/UserInterface/Dialogs/StationDialog.vala:117 +msgid "Url" +msgstr "Url" + +#: src/UserInterface/Widgets/GenresListStore.vala:25 msgid "New Genre" -msgstr "Nieuw genre" +msgstr "" + +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:66 +msgid "Add Genre" +msgstr "" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:68 +#: src/UserInterface/Widgets/GenresTreeViewToolbar.vala:70 +msgid "Remove Genre" +msgstr "" + +#: src/UserInterface/Widgets/DiscoverBox.vala:69 msgid "Find new radio stations instantly" msgstr "Vind direct nieuwe zenders" -#: ../src/UserInterface/Widgets/DiscoverBox.vala:71 +#: src/UserInterface/Widgets/DiscoverBox.vala:72 msgid "This feature is currently not implemented." msgstr "Deze functionaliteit is op dit moment niet geïmplementeerd." -#: ../src/UserInterface/Widgets/DiscoverBox.vala:73 +#: src/UserInterface/Widgets/DiscoverBox.vala:74 msgid "Support our work to keep improving our free applications." msgstr "Ondersteun ons werk om onze vrije applicaties te verbeteren." -#: ../src/UserInterface/Widgets/DiscoverBox.vala:76 -#: ../src/UserInterface/Menus/ApplicationMenu.vala:47 -msgid "Donate" -msgstr "Doneer" +#: src/UserInterface/Dialogs/StationDialog.vala:60 +#: src/UserInterface/Dialogs/ErrorDialog.vala:55 +msgid "Close" +msgstr "Sluiten" -#: ../src/UserInterface/Widgets/GenresTreeView.vala:58 -#: ../src/UserInterface/Widgets/StationsTreeView.vala:76 -msgid "Genre" -msgstr "Genre" +#: src/UserInterface/Dialogs/StationDialog.vala:116 +msgid "Name" +msgstr "Naam" -#: ../src/UserInterface/Widgets/StationsTreeView.vala:75 -msgid "Station" -msgstr "Zender" +#: src/UserInterface/Dialogs/AddStationDialog.vala:33 +msgid "Add Station" +msgstr "Zender Toevoegen" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:41 -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:99 -msgid "Add to Favorites" -msgstr "Voeg toe aan Favorieten" +#: src/UserInterface/Dialogs/EditStationDialog.vala:35 +msgid "Update Details" +msgstr "Ververs details" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:42 -msgid "Edit station info" -msgstr "Bewerk zender informatie" +#: src/UserInterface/Dialogs/ErrorDialog.vala:56 +msgid "Report a bug" +msgstr "Meld een fout" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:43 -msgid "Remove from Library" -msgstr "Verwijder uit bibliotheek" +#: src/UserInterface/Dialogs/ErrorDialog.vala:67 +msgid "A problem occured while inserting station to database." +msgstr "" -#: ../src/UserInterface/Menus/StationsTreeViewContextMenu.vala:97 -msgid "Remove from Favorites" -msgstr "Verwijder uit favorieten" +#: src/UserInterface/Dialogs/ErrorDialog.vala:76 +msgid "" +"If you believe this is a bug please report it to help us improve our " +"software." +msgstr "" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:43 -msgid "Add New Station" -msgstr "Voeg nieuwe zender toe" +#: src/UserInterface/Dialogs/ImportProgressDialog.vala:42 +msgid "Importing stations, please wait." +msgstr "Zenders aan het importeren, even geduld alstublieft." -#: ../src/UserInterface/Menus/ApplicationMenu.vala:44 -msgid "Backup" -msgstr "Maak een reservekopie" +#: src/UserInterface/Others/FileChooserCreator.vala:24 +msgid "Import Radio Stations Package" +msgstr "Importeer radio zender paket" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:45 -msgid "Import Stations" -msgstr "Zenders importeren" +#: src/UserInterface/Others/FileChooserCreator.vala:26 +#: src/UserInterface/Others/FileChooserCreator.vala:48 +msgid "Cancel" +msgstr "Annuleren" -#: ../src/UserInterface/Menus/ApplicationMenu.vala:46 -msgid "Export Stations" -msgstr "Zenders exporteren" +#: src/UserInterface/Others/FileChooserCreator.vala:27 +msgid "Open" +msgstr "Openen" + +#: src/UserInterface/Others/FileChooserCreator.vala:40 +#: src/UserInterface/Others/FileChooserCreator.vala:62 +msgid "eRadio Package" +msgstr "eRadio paket" + +#: src/UserInterface/Others/FileChooserCreator.vala:46 +msgid "Export Radio Stations" +msgstr "Exporteer radio zenders" + +#: src/UserInterface/Others/FileChooserCreator.vala:49 +msgid "Save" +msgstr "Opslaan" diff --git a/schemas/com.dreamdevel.eradio.gschema.xml b/schemas/com.github.dreamdevel.eradio.gschema.xml similarity index 92% rename from schemas/com.dreamdevel.eradio.gschema.xml rename to schemas/com.github.dreamdevel.eradio.gschema.xml index 4bf6203..6c7b5cb 100644 --- a/schemas/com.dreamdevel.eradio.gschema.xml +++ b/schemas/com.github.dreamdevel.eradio.gschema.xml @@ -1,5 +1,6 @@ + - + 1.4 Stream Timeout @@ -41,7 +42,7 @@ The height of the window - + 160 Sidebar Width diff --git a/schemas/meson.build b/schemas/meson.build new file mode 100644 index 0000000..45ed0f7 --- /dev/null +++ b/schemas/meson.build @@ -0,0 +1,4 @@ +install_data( + meson.project_name() + '.gschema.xml', + install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas') +) \ No newline at end of file diff --git a/src/Core/MPRIS.vala b/src/Core/MPRIS.vala index 7ae77e8..28f3e54 100644 --- a/src/Core/MPRIS.vala +++ b/src/Core/MPRIS.vala @@ -31,7 +31,7 @@ public class Radio.Core.MPRIS : GLib.Object { public void initialize () { owner_id = Bus.own_name(BusType.SESSION, - "org.mpris.MediaPlayer2." + Radio.App.instance.exec_name, + "org.mpris.MediaPlayer2." + Radio.App.APPLICATION_ID, GLib.BusNameOwnerFlags.NONE, on_bus_acquired, on_name_acquired, @@ -87,13 +87,13 @@ public class MprisRoot : GLib.Object { } public string DesktopEntry { owned get { - return Radio.App.instance.app_launcher.replace (".desktop", ""); + return Radio.App.APPLICATION_ID; } } public string Identity { owned get { - return Radio.App.instance.program_name; + return Radio.App.PROGRAM_NAME; } } @@ -184,7 +184,7 @@ public class MprisPlayer : GLib.Object { private void set_media_metadata (Radio.Models.Station? station) { _metadata = new HashTable (null, null); _metadata.insert("xesam:title", station.name); - _metadata.insert("xesam:artist", get_simple_string_array("Unknown")); + _metadata.insert("xesam:artist", get_simple_string_array(_("Unknown"))); } private static string[] get_simple_string_array (string? text) { diff --git a/src/Core/Notifier.vala b/src/Core/Notifier.vala index e47414b..b34c44b 100644 --- a/src/Core/Notifier.vala +++ b/src/Core/Notifier.vala @@ -34,7 +34,7 @@ return; var playing_station = App.player.station; - new_notification (playing_station.name,_("You are listening to.")); + new_notification (playing_station.name, _("You are listening to.")); } public void new_notification (string title, string subtitle, Gdk.Pixbuf? icon=null) { @@ -43,7 +43,7 @@ return; if (notification == null) { - notification = new Notify.Notification (title,subtitle,"eRadio"); + notification = new Notify.Notification (title,subtitle,Radio.App.PROGRAM_NAME); } else { notification.update (title,subtitle,null); } diff --git a/src/error.vala b/src/Error.vala similarity index 99% rename from src/error.vala rename to src/Error.vala index bf88605..f111ebd 100644 --- a/src/error.vala +++ b/src/Error.vala @@ -22,4 +22,4 @@ public errordomain Radio.Error { DatabaseCreate, DatabaseWrite, DatabaseRead, -} \ No newline at end of file +} diff --git a/src/main.vala b/src/Main.vala similarity index 100% rename from src/main.vala rename to src/Main.vala diff --git a/src/package_manager.vala b/src/PackageManager.vala similarity index 100% rename from src/package_manager.vala rename to src/PackageManager.vala diff --git a/src/radio.vala b/src/Radio.vala similarity index 83% rename from src/radio.vala rename to src/Radio.vala index 762ac43..72f2142 100644 --- a/src/radio.vala +++ b/src/Radio.vala @@ -18,7 +18,7 @@ * Fotini Skoti */ -class Radio.App : Granite.Application { +class Radio.App : Gtk.Application { public static Radio.Windows.MainWindow main_window {get;private set;default = null;} public static Radio.App instance; @@ -41,33 +41,10 @@ class Radio.App : Granite.Application { public signal void ui_build_finished (); public static bool ui_ready = false; - construct { - // Application info - build_data_dir = Build.DATADIR; - build_pkg_data_dir = Build.PKG_DATADIR; - build_release_name = Build.RELEASE_NAME; - build_version = Build.VERSION; - build_version_info = Build.VERSION_INFO; - - program_name = "eRadio"; - exec_name = "com.github.dreamdevel.eradio"; - - app_copyright = "2014-2017"; - application_id = "com.github.dreamdevel.eradio"; - app_icon = "com.github.dreamdevel.eradio"; - app_launcher = "com.github.dreamdevel.eradio.desktop"; - app_years = "2014 - 2017"; - - main_url = "http://eradio.dreamdevel.com"; - bug_url = "https://github.com/DreamDevel/eRadio/issues"; - translate_url = "https://translations.launchpad.net/eradio"; - about_authors = {"George Sofianos ",null}; - help_url = "https://answers.launchpad.net/eradio"; - about_artists = {"George Sofianos ", null}; - about_documenters = { "George Sofianos ", - null }; - about_license_type = Gtk.License.GPL_3_0; + public const string PROGRAM_NAME = "eRadio"; + public const string APPLICATION_ID = "com.github.dreamdevel.eradio"; + construct { this.set_flags (ApplicationFlags.HANDLES_COMMAND_LINE); } @@ -81,6 +58,8 @@ class Radio.App : Granite.Application { else if (!main_window.visible) main_window.show (); + weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default (); + default_theme.add_resource_path ("/com/github/dreamdevel/eradio"); } public void initialize () { @@ -101,7 +80,7 @@ class Radio.App : Granite.Application { initialize_database (); Radio.MediaKeyListener.instance.init (); mpris.initialize (); - Notify.init (this.program_name); + Notify.init (PROGRAM_NAME); } private void create_user_interface () { diff --git a/src/UserInterface/Dialogs/ErrorDialog.vala b/src/UserInterface/Dialogs/ErrorDialog.vala index b36a201..a21a679 100644 --- a/src/UserInterface/Dialogs/ErrorDialog.vala +++ b/src/UserInterface/Dialogs/ErrorDialog.vala @@ -64,7 +64,7 @@ public class Radio.Dialogs.ErrorDialog : Gtk.Dialog { set_dialog_margins (); // TODO implement inkscape mockup - var error_message = new Gtk.Label("A problem occured while inserting station to database.ddddddddddddd"); + var error_message = new Gtk.Label(_("A problem occured while inserting station to database.")); error_message.set_line_wrap (true); error_message.set_max_width_chars (44); @@ -73,7 +73,7 @@ public class Radio.Dialogs.ErrorDialog : Gtk.Dialog { error_message_box.pack_start (new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG),false); error_message_box.pack_start (error_message,false); - var report_info = new Gtk.Label("If you believe this is a bug please report it to help us improve our software."); + var report_info = new Gtk.Label(_("If you believe this is a bug please report it to help us improve our software.")); report_info.set_line_wrap (true); report_info.set_max_width_chars (44); main_box.pack_start (error_message_box,false); @@ -88,9 +88,9 @@ public class Radio.Dialogs.ErrorDialog : Gtk.Dialog { var content_area = get_content_area (); main_box.margin_bottom = 24; - main_box.margin_left = 12; - main_box.margin_right = 6; - content_area.margin_right = 6; + main_box.margin_start = 12; + main_box.margin_end = 6; + content_area.margin_end = 6; content_area.margin_bottom = 6; } diff --git a/src/UserInterface/Dialogs/ProgressDialog.vala b/src/UserInterface/Dialogs/ProgressDialog.vala index 581523e..065612c 100644 --- a/src/UserInterface/Dialogs/ProgressDialog.vala +++ b/src/UserInterface/Dialogs/ProgressDialog.vala @@ -68,9 +68,9 @@ public class Radio.Dialogs.ProgressDialog : Gtk.Dialog { var content_area = get_content_area (); main_box.margin_bottom = 24; - main_box.margin_left = 12; - main_box.margin_right = 6; - content_area.margin_right = 6; + main_box.margin_start = 12; + main_box.margin_end = 6; + content_area.margin_end = 6; content_area.margin_bottom = 6; } diff --git a/src/UserInterface/Dialogs/StationDialog.vala b/src/UserInterface/Dialogs/StationDialog.vala index c277fb1..50003ca 100644 --- a/src/UserInterface/Dialogs/StationDialog.vala +++ b/src/UserInterface/Dialogs/StationDialog.vala @@ -134,9 +134,9 @@ public abstract class Radio.Dialogs.StationDialog : Gtk.Dialog { var content_area = get_content_area (); main_box.margin_bottom = 24; - main_box.margin_left = 12; - main_box.margin_right = 6; - content_area.margin_right = 6; + main_box.margin_start = 12; + main_box.margin_end = 6; + content_area.margin_end = 6; content_area.margin_bottom = 6; } diff --git a/src/UserInterface/Menus/ApplicationMenu.vala b/src/UserInterface/Menus/ApplicationMenu.vala index 25e6192..a82940e 100644 --- a/src/UserInterface/Menus/ApplicationMenu.vala +++ b/src/UserInterface/Menus/ApplicationMenu.vala @@ -85,10 +85,6 @@ public class Radio.Menus.ApplicationMenu : Gtk.Menu { } } - public Granite.Widgets.AppMenu get_as_granite_app_menu () { - return Radio.App.instance.create_appmenu (this); - } - public Gtk.MenuButton get_as_gtk_menu_button () { Gtk.MenuButton appMenu = new Gtk.MenuButton(); var menu_icon = new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR); diff --git a/src/UserInterface/Widgets/DiscoverBox.vala b/src/UserInterface/Widgets/DiscoverBox.vala index 7463000..914c727 100644 --- a/src/UserInterface/Widgets/DiscoverBox.vala +++ b/src/UserInterface/Widgets/DiscoverBox.vala @@ -63,7 +63,7 @@ public class Radio.Widgets.DiscoverBox : Gtk.Box { } private void create_elements () { - discover_image = new Gtk.Image.from_file("/usr/share/eradio/discoverBig.png"); + discover_image = new Gtk.Image.from_icon_name("eradio-discover", Gtk.IconSize.DIALOG); header = new Gtk.Label(_("Discover")); header.get_style_context().add_class("header"); subheader = new Gtk.Label(_("Find new radio stations instantly")); diff --git a/src/UserInterface/Widgets/GenresTreeViewToolbar.vala b/src/UserInterface/Widgets/GenresTreeViewToolbar.vala index 553bb6f..d062933 100644 --- a/src/UserInterface/Widgets/GenresTreeViewToolbar.vala +++ b/src/UserInterface/Widgets/GenresTreeViewToolbar.vala @@ -63,9 +63,11 @@ public class Radio.Widgets.GenresTreeViewToolbar : Gtk.Toolbar { // TODO add tooltips Gtk.Image add_toolbutton_image = new Gtk.Image.from_icon_name ("list-add-symbolic", Gtk.IconSize.SMALL_TOOLBAR); add_toolbutton = new Gtk.ToolButton (add_toolbutton_image,null); + add_toolbutton.tooltip_text = _("Add Genre"); Gtk.Image remove_toolbutton_image = new Gtk.Image.from_icon_name ("list-remove-symbolic", Gtk.IconSize.SMALL_TOOLBAR); remove_toolbutton = new Gtk.ToolButton (remove_toolbutton_image,null); + remove_toolbutton.tooltip_text = _("Remove Genre"); } private void append_toolbar_buttons () { diff --git a/src/UserInterface/Widgets/HeaderBar.vala b/src/UserInterface/Widgets/HeaderBar.vala index 14a9f93..9d93666 100644 --- a/src/UserInterface/Widgets/HeaderBar.vala +++ b/src/UserInterface/Widgets/HeaderBar.vala @@ -26,7 +26,7 @@ public class Radio.Widgets.HeaderBar : Gtk.HeaderBar { private Gtk.ToolButton previous_button; private Gtk.ToolButton next_button; private Gtk.Box title_box; - private Gtk.MenuButton application_menu; + private Gtk.MenuButton application_menu; private Gtk.Label playback_label; @@ -59,8 +59,11 @@ public class Radio.Widgets.HeaderBar : Gtk.HeaderBar { next_button = new Gtk.ToolButton (null,""); play_button.set_icon_name (play_icon_image_name); + play_button.tooltip_text = _("Play"); next_button.set_icon_name (next_icon_image_name); + next_button.tooltip_text = _("Next Station"); previous_button.set_icon_name (previous_icon_image_name); + previous_button.tooltip_text = _("Previous Station"); // By default we disable the buttons play_button.set_sensitive (false); @@ -90,6 +93,7 @@ public class Radio.Widgets.HeaderBar : Gtk.HeaderBar { private void create_application_menu () { application_menu = (new Radio.Menus.ApplicationMenu ()).get_as_gtk_menu_button (); + application_menu.tooltip_text = _("Menu"); } private void append_headerbar_items () { @@ -190,6 +194,7 @@ public class Radio.Widgets.HeaderBar : Gtk.HeaderBar { private void handle_player_status_playing () { play_button.set_icon_name (pause_icon_image_name); + play_button.tooltip_text = _("Pause"); play_button.set_sensitive (true); change_title (App.player.station.name); diff --git a/src/UserInterface/Widgets/StationsListStore.vala b/src/UserInterface/Widgets/StationsListStore.vala index 3790efb..dd374bf 100644 --- a/src/UserInterface/Widgets/StationsListStore.vala +++ b/src/UserInterface/Widgets/StationsListStore.vala @@ -26,7 +26,10 @@ public class Radio.Widgets.StationsListStore : Gtk.ListStore, Gtk.TreeSortable { const int URL_COLUMN_ID = 2; const int ID_COLUMN_ID = 3; const int ICON_COLUMN_ID = 4; + const int FAVORITE_COLUMN_ID = 5; const string play_icon_name = "audio-volume-high-symbolic"; + const string favorite_icon_name = "eradio-favorites"; + const string empty_favorite_icon_name = "eradio-empty-favorites"; public ListStoreFilterType current_filter_type = ListStoreFilterType.NONE; public string current_filter_argument = ""; @@ -46,6 +49,7 @@ public class Radio.Widgets.StationsListStore : Gtk.ListStore, Gtk.TreeSortable { typeof(string), // station genre column typeof(string), // station url column typeof(int), // station id column (hidden) + typeof(string), // icon column (icon name) typeof(string) // icon column (icon name) }); @@ -104,7 +108,7 @@ public class Radio.Widgets.StationsListStore : Gtk.ListStore, Gtk.TreeSortable { genres_text += ", "; } } else { - genres_text = "Unknown"; + genres_text = _("Unknown"); } Gtk.TreeIter iterator; @@ -114,8 +118,14 @@ public class Radio.Widgets.StationsListStore : Gtk.ListStore, Gtk.TreeSortable { set_value (iterator,URL_COLUMN_ID,station.url); set_value (iterator,ID_COLUMN_ID,station.id); + if (station.favorite) { + set_favorite_icon_to_iter (iterator); + } else { + set_empty_favorite_icon_to_iter (iterator); + } + if (App.player.status == PlayerStatus.PLAYING && App.player.station.id == station.id) - set_play_icon_to_iter (iterator); + set_play_icon_to_iter (iterator); entry_added (); } @@ -160,12 +170,17 @@ public class Radio.Widgets.StationsListStore : Gtk.ListStore, Gtk.TreeSortable { genres_text += ", "; } } else { - genres_text = "Unknown"; + genres_text = _("Unknown"); } set_value (iterator,GENRE_COLUMN_ID,genres_text); if (old_station.favorite != new_station.favorite) { + if(new_station.favorite) { + set_favorite_icon_to_edited_station (new_station); + } else { + remove_favorite_icon_from_edited_station (new_station); + } if (old_station.favorite && current_filter_type == ListStoreFilterType.FAVORITES) remove_station_with_id(new_station.id); } @@ -192,6 +207,22 @@ public class Radio.Widgets.StationsListStore : Gtk.ListStore, Gtk.TreeSortable { set_play_icon_to_iter (station_iter); } + private void set_favorite_icon_to_edited_station (Radio.Models.Station edited_station) { + var station_iter = get_iterator_for_station_id (edited_station.id); + if (station_iter == null) + return; + + set_favorite_icon_to_iter (station_iter); + } + + private void set_favorite_icon_to_iter (Gtk.TreeIter iterator) { + set_value(iterator,FAVORITE_COLUMN_ID,favorite_icon_name); + } + + private void set_empty_favorite_icon_to_iter (Gtk.TreeIter iterator) { + set_value(iterator,FAVORITE_COLUMN_ID,empty_favorite_icon_name); + } + private void set_play_icon_to_iter (Gtk.TreeIter iterator) { set_value(iterator,ICON_COLUMN_ID,play_icon_name); } @@ -205,6 +236,18 @@ public class Radio.Widgets.StationsListStore : Gtk.ListStore, Gtk.TreeSortable { remove_play_icon_from_iter (station_iter); } + private void remove_favorite_icon_from_edited_station (Radio.Models.Station edited_station) { + var station_iter = get_iterator_for_station_id (edited_station.id); + if (station_iter == null) + return; + + remove_favorite_icon_from_iter (station_iter); + } + + private void remove_favorite_icon_from_iter (Gtk.TreeIter iterator) { + set_value(iterator,FAVORITE_COLUMN_ID,empty_favorite_icon_name); + } + private void remove_play_icon_from_iter (Gtk.TreeIter iterator) { set_value(iterator,ICON_COLUMN_ID,""); } diff --git a/src/UserInterface/Widgets/StationsTreeView.vala b/src/UserInterface/Widgets/StationsTreeView.vala index a5df860..2f56ce7 100644 --- a/src/UserInterface/Widgets/StationsTreeView.vala +++ b/src/UserInterface/Widgets/StationsTreeView.vala @@ -21,6 +21,7 @@ public class Radio.Widgets.StationsTreeView : Gtk.TreeView { + private Gtk.TreeViewColumn favorite_icon_column; private Gtk.TreeViewColumn play_icon_column; private Gtk.TreeViewColumn title_column; private Gtk.TreeViewColumn genre_column; @@ -48,7 +49,6 @@ public class Radio.Widgets.StationsTreeView : Gtk.TreeView { create_context_menu (); set_model (stations_liststore); - set_rules_hint(true); } private void create_liststore () { @@ -56,6 +56,7 @@ public class Radio.Widgets.StationsTreeView : Gtk.TreeView { } private void create_columns () { + favorite_icon_column = new Gtk.TreeViewColumn (); play_icon_column = new Gtk.TreeViewColumn (); title_column = new Gtk.TreeViewColumn (); genre_column = new Gtk.TreeViewColumn (); @@ -76,17 +77,20 @@ public class Radio.Widgets.StationsTreeView : Gtk.TreeView { genre_column.set_title (_("Genre")); url_column.set_title (_("Url")); play_icon_column.set_title (" "); + favorite_icon_column.set_title (" "); title_column.set_fixed_width(Radio.App.saved_state.title_column_width); genre_column.set_fixed_width(Radio.App.saved_state.genre_column_width); play_icon_column.set_min_width(30); + favorite_icon_column.set_min_width(30); title_column.set_min_width (140); genre_column.set_min_width (100); title_column.set_sort_column_id(0); play_icon_column.resizable = false; + favorite_icon_column.resizable = false; title_column.resizable = true; genre_column.resizable = true; } @@ -96,14 +100,17 @@ public class Radio.Widgets.StationsTreeView : Gtk.TreeView { genre_column.pack_start(cell_text_renderer,false); url_column.pack_start(cell_text_renderer,false); play_icon_column.pack_start(cell_pixbuf_renderer,false); + favorite_icon_column.pack_start(cell_pixbuf_renderer,false); title_column.add_attribute(cell_text_renderer,"text",0); genre_column.add_attribute(cell_text_renderer,"text",1); url_column.add_attribute(cell_text_renderer,"text",2); play_icon_column.add_attribute(cell_pixbuf_renderer,"icon-name",4); + favorite_icon_column.add_attribute(cell_pixbuf_renderer,"icon-name",5); } private void append_columns () { + append_column(favorite_icon_column); append_column(play_icon_column); append_column(title_column); append_column(genre_column); diff --git a/src/UserInterface/Windows/MainWindow.vala b/src/UserInterface/Windows/MainWindow.vala index 43fc7e7..5dc19ca 100644 --- a/src/UserInterface/Windows/MainWindow.vala +++ b/src/UserInterface/Windows/MainWindow.vala @@ -38,7 +38,7 @@ public class Radio.Windows.MainWindow : Gtk.Window { private void set_window_properties () { var saved_state = Radio.App.saved_state; - this.set_title (Radio.App.instance.program_name); + this.set_title (Radio.App.PROGRAM_NAME); this.set_size_request (500, 250); this.set_default_size(saved_state.window_width,saved_state.window_height); this.set_application (Radio.App.instance); diff --git a/src/config.vala.cmake b/src/config.vala.cmake deleted file mode 100644 index 3534300..0000000 --- a/src/config.vala.cmake +++ /dev/null @@ -1,30 +0,0 @@ -/*- - * Copyright (c) 2014 George Sofianos - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * Authored by: George Sofianos - */ - -namespace Build { - public const string DATADIR = "@DATADIR@"; - public const string PKG_DATADIR = "@PKG_DATADIR@"; - public const string PLUGIN_DIR = "@PLUGIN_DIR@"; - public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; - public const string RELEASE_NAME = "@RELEASE_NAME@"; - public const string VERSION = "@VERSION@"; - public const string VERSION_INFO = "@VERSION_INFO@"; - public const string CMAKE_INSTALL_PREFIX = "@CMAKE_INSTALL_PREFIX@"; - public const string ICON_DIR = "@ICON_DIR@"; -} \ No newline at end of file diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..c11e053 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,60 @@ +sources = files( + 'Main.vala', + 'Radio.vala', + 'Error.vala', + 'PackageManager.vala', + + 'Enums/PlayerStatus.vala', + 'Enums/ListStoreFilterType.vala', + + 'Models/Genre.vala', + 'Models/Station.vala', + 'Models/WebRadio.vala', + + 'Core/Database.vala', + 'Core/Player.vala', + 'Core/PlayerHelper.vala', + 'Core/MPRIS.vala', + 'Core/MediaKeyListener.vala', + 'Core/Notifier.vala', + 'Core/Settings.vala', + 'Core/DatabaseModels/GenreModel.vala', + 'Core/DatabaseModels/StationModel.vala', + 'Core/DatabaseModels/StationsGenresModel.vala', + 'Core/PlayerDecoders/M3UDecoder.vala', + 'Core/PlayerDecoders/PLSDecoder.vala', + 'Core/PlayerDecoders/ASXDecoder.vala', + 'Core/WidgetManager.vala', + + 'UserInterface/Menus/ApplicationMenu.vala', + 'UserInterface/Menus/StationsTreeViewContextMenu.vala', + + 'UserInterface/Views/WelcomeView.vala', + 'UserInterface/Views/StationsListView.vala', + + 'UserInterface/Widgets/HeaderBar.vala', + 'UserInterface/Widgets/SideBar.vala', + 'UserInterface/Widgets/ViewStack.vala', + 'UserInterface/Widgets/StationsListStore.vala', + 'UserInterface/Widgets/GenresListStore.vala', + 'UserInterface/Widgets/StationsTreeView.vala', + 'UserInterface/Widgets/StationsTreeViewScrollable.vala', + 'UserInterface/Widgets/GenresTreeView.vala', + 'UserInterface/Widgets/GenresTreeViewScrollable.vala', + 'UserInterface/Widgets/GenresTreeViewToolbar.vala', + 'UserInterface/Widgets/SideBarExpandableItem.vala', + 'UserInterface/Widgets/LevelBar.vala', + 'UserInterface/Widgets/DiscoverBox.vala', + 'UserInterface/Widgets/MainStack.vala', + + 'UserInterface/Dialogs/StationDialog.vala', + 'UserInterface/Dialogs/AddStationDialog.vala', + 'UserInterface/Dialogs/EditStationDialog.vala', + 'UserInterface/Dialogs/ErrorDialog.vala', + 'UserInterface/Dialogs/ProgressDialog.vala', + 'UserInterface/Dialogs/ImportProgressDialog.vala', + + 'UserInterface/Others/FileChooserCreator.vala', + + 'UserInterface/Windows/MainWindow.vala' +) diff --git a/tools/build b/tools/build deleted file mode 100755 index 867f4eb..0000000 --- a/tools/build +++ /dev/null @@ -1,2 +0,0 @@ -cd $PROJ_DIR && mkdir -p build && cd $BUILD_DIR && cmake -DCMAKE_INSTALL_PREFIX=/usr $PROJ_DIR -make -f $BUILD_DIR/Makefile diff --git a/tools/build_from_sublime b/tools/build_from_sublime deleted file mode 100644 index f004981..0000000 --- a/tools/build_from_sublime +++ /dev/null @@ -1,2 +0,0 @@ -cmake -DCMAKE_INSTALL_PREFIX=/usr .. -make \ No newline at end of file diff --git a/tools/dev-shell b/tools/dev-shell deleted file mode 100755 index cdc210d..0000000 --- a/tools/dev-shell +++ /dev/null @@ -1,6 +0,0 @@ -export EXEC_NAME="eradio" -export PROJ_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd ../ && pwd )" -export TOOLS_DIR="$PROJ_DIR/tools" -export BUILD_DIR="$PROJ_DIR/build" -export EXEC_PATH="$PROJ_DIR/build/$EXEC_NAME" -export PATH=$PATH:$TOOLS_DIR \ No newline at end of file diff --git a/tools/install-app b/tools/install-app deleted file mode 100755 index 71c8671..0000000 --- a/tools/install-app +++ /dev/null @@ -1 +0,0 @@ -cd $BUILD_DIR && sudo make install diff --git a/tools/install-deps b/tools/install-deps deleted file mode 100755 index 9134105..0000000 --- a/tools/install-deps +++ /dev/null @@ -1 +0,0 @@ -sudo apt-get -y install cmake valac libgstreamer1.0-dev libgtk-3-dev libgranite-dev libsqlite3-dev libgee-0.8-dev libnotify-dev libjson-glib-dev libsoup2.4-dev libxml2-dev libsqlheavy-dev diff --git a/tools/install-deps-ubuntu b/tools/install-deps-ubuntu deleted file mode 100755 index 185055d..0000000 --- a/tools/install-deps-ubuntu +++ /dev/null @@ -1,3 +0,0 @@ -sudo add-apt-repository -y ppa:elementary-os/stable -sudo apt-get update -sudo apt-get -y install cmake valac libgstreamer1.0-dev libgtk-3-dev libgranite-dev libsqlite3-dev libgee-0.8-dev libnotify-dev libjson-glib-dev libsoup2.4-dev libxml2-dev diff --git a/tools/run b/tools/run deleted file mode 100755 index dfe21d9..0000000 --- a/tools/run +++ /dev/null @@ -1 +0,0 @@ -$EXEC_PATH -d \ No newline at end of file