1
0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-27 01:54:20 +01:00
Commit Graph

5245 Commits

Author SHA1 Message Date
Clementine Buildbot
b3766a392b Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2014-03-03 10:01:41 +01:00
David Sansome
b14d2f3123 Never use the system's sha2 library - ours has a different API now. Fixes #4217 2014-02-28 19:48:58 +11:00
Clementine Buildbot
ee131f07d5 Automatic merge of translations from Transifex (https://www.transifex.com/projects/p/clementine/resource/clementineplayer) 2014-02-24 10:01:39 +01:00
Andreas
95c4db25e0 Broken kittens repaired. Aww.... 2014-02-22 22:21:00 +01:00
Andreas
d397f711fe Better placeing of the loading icon when automatic cover loading is activated. 2014-02-22 21:27:58 +01:00
John Maguire
5146bcdebc Some more NULL -> nullptr conversions. 2014-02-21 17:30:46 +01:00
John Maguire
0e4aff8b74 Add copyright info for breakpad. 2014-02-20 18:15:45 +01:00
John Maguire
708573f3ac Add copyright information for libechonest 2014-02-20 18:13:15 +01:00
John Maguire
3b1c9e7e5f Remove some old copyright notices. 2014-02-20 18:10:28 +01:00
John Maguire
b81e5bce5e Remove google code upload scripts. 2014-02-20 18:00:26 +01:00
John Maguire
0f790796a0 Update repo in PPA upload script. 2014-02-19 18:34:22 +01:00
John Maguire
6fb4b8e97d Merge branch 'release-1.2'
Conflicts:
	cmake/Version.cmake
	ext/libclementine-common/core/closure.cpp
	ext/libclementine-common/core/closure.h
	ext/libclementine-common/core/concurrentrun.h
	ext/libclementine-remote/remotecontrolmessages.proto
	ext/libclementine-tagreader/tagreader.cpp
	src/core/deletefiles.cpp
	src/core/deletefiles.h
	src/core/mac_utilities.h
	src/core/mergedproxymodel.h
	src/core/musicstorage.h
	src/core/organise.cpp
	src/core/organise.h
	src/core/player.cpp
	src/core/songloader.cpp
	src/core/utilities.cpp
	src/devices/connecteddevice.h
	src/devices/devicekitlister.h
	src/devices/devicemanager.cpp
	src/devices/devicemanager.h
	src/devices/deviceproperties.cpp
	src/devices/deviceview.cpp
	src/devices/giolister.cpp
	src/devices/gpodloader.cpp
	src/devices/gpodloader.h
	src/devices/mtploader.cpp
	src/devices/mtploader.h
	src/engines/gstengine.cpp
	src/engines/gstengine.h
	src/engines/gstenginepipeline.cpp
	src/globalsearch/globalsearchview.cpp
	src/internet/groovesharkservice.cpp
	src/internet/magnatunedownloaddialog.cpp
	src/library/groupbydialog.h
	src/library/librarydirectorymodel.cpp
	src/library/librarymodel.cpp
	src/library/libraryview.cpp
	src/main.cpp
	src/networkremote/networkremote.cpp
	src/networkremote/networkremote.h
	src/networkremote/outgoingdatacreator.cpp
	src/networkremote/outgoingdatacreator.h
	src/playlist/playlist.cpp
	src/playlist/playlistbackend.cpp
	src/playlist/playlistbackend.h
	src/playlist/playlistdelegates.cpp
	src/playlist/playlistview.h
	src/playlistparsers/plsparser.cpp
	src/smartplaylists/generator.h
	src/smartplaylists/querywizardplugin.cpp
	src/smartplaylists/searchpreview.cpp
	src/songinfo/songinfoview.h
	src/transcoder/transcoder.cpp
	src/ui/albumcovermanagerlist.cpp
	src/ui/mainwindow.cpp
	src/ui/organisedialog.cpp
	src/visualisations/projectmvisualisation.cpp
	src/visualisations/projectmvisualisation.h
	src/widgets/nowplayingwidget.cpp
	src/widgets/nowplayingwidget.h
	src/widgets/osd.h
	src/widgets/osd_x11.cpp
	src/wiimotedev/shortcuts.cpp
2014-02-19 18:19:54 +01:00
Clementine Buildbot
734b7b9bd7 Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2014-02-17 10:01:43 +01:00
John Maguire
b46e9ff55c Seems this should be the other way around. 2014-02-14 15:51:08 +01:00
John Maguire
c162a9316d Fix clang warning. 2014-02-14 14:36:47 +01:00
John Maguire
fc9c983e2c Put global functions used for startup in namespace 2014-02-13 18:59:59 +01:00
David Sansome
28873605ff Merge pull request #4209 from paperbagcorner/fix-forloop
Iterate over a copy of the parents container since we are removing elements from the original
2014-02-13 21:33:46 +11:00
Mattias Andersson
3b01247df9 Iterate over a copy of the parents container since we are removing elements from the original. 2014-02-13 10:41:24 +01:00
Arnaud Bienner
faaa75cb61 Few style fixes + avoid unneeded copies 2014-02-12 22:11:28 +01:00
John Maguire
858cfce9ff Merge pull request #4204 from abika/master
correct selection after removing rows in playlist
2014-02-11 15:49:42 +01:00
David Sansome
c36f4e46db Add "make format-diff" and "make format" commands that use clang-format to reformat source. 2014-02-12 01:20:49 +11:00
Alexander Bikadorov
3adaf5d598 fixed indentation / coding style 2014-02-11 13:18:08 +01:00
Alexander Bikadorov
c7ac2012b4 correct selection after removing rows in playlist 2014-02-10 16:51:43 +01:00
John Maguire
192b60d965 Use nullptr as parent parameter default everywhere 2014-02-10 16:03:54 +01:00
John Maguire
fd183a80ff Merge branch 'coding_style_fixes_and_c++11' of https://github.com/sobkas/Clementine into sobkas-coding_style_fixes_and_c++11
Conflicts:
	src/podcasts/addpodcastbyurl.cpp
	src/podcasts/gpoddersync.cpp
	src/podcasts/podcastinfowidget.cpp
	src/podcasts/podcastupdater.cpp
2014-02-10 15:55:42 +01:00
John Maguire
3323c2d094 Convert all instances of foreach() to a C++11 for
find ext src -name '*.cpp' -exec \
    sed -i -e 's/foreach(\([^,]\+\),/for (\1 :/' {} \;
2014-02-10 14:43:32 +01:00
Krzysztof A. Sobiecki
f6941726f9 Use nullptr instead of 0 2014-02-10 14:20:20 +01:00
Krzysztof A. Sobiecki
1d1cc92263 Someone else 2014-02-10 13:51:03 +01:00
Clementine Buildbot
89433be9aa Automatic merge of translations from Transifex (https://www.transifex.net/projects/p/clementine/resource/clementineplayer) 2014-02-10 10:01:46 +01:00
Krzysztof A. Sobiecki
6d2cdad286 So here list have hidden 2014-02-09 18:46:59 +01:00
Krzysztof A. Sobiecki
d7ff44005e No more 'auto' :( 2014-02-09 17:53:20 +01:00
Krzysztof A. Sobiecki
c71782c700 I don't know who put this damn spaces there 2014-02-09 17:07:35 +01:00
David Sansome
67f6560c04 Merge pull request #4194 from abika/master
Use double click settings as default behaviour for new files added as command line arguments.  Fixes #4183
2014-02-09 16:51:10 +11:00
David Sansome
7b93630b03 Resize the sort order combobox when its contents changes. Fixes #4173 2014-02-09 16:43:43 +11:00
David Sansome
fc5b5f584e Merge pull request #4198 from paperbagcorner/searchtooltip
Add a tool tip to the library search field. Fixes #3344
2014-02-09 14:23:10 +11:00
John Maguire
54c9393358 Merge pull request #4201 from Fitoschido/patch-1
Remove deprecated X-Ayatana actions
2014-02-08 23:52:45 +01:00
Adolfo Jayme Barrientos
3f8976b217 Remove deprecated X-Ayatana actions
Replace with Freedesktop Actions which work with newer Unity.

While I’m here, remove old, redundant es_AR and update ca and es.
2014-02-08 13:25:26 -06:00
John Maguire
c6ff832cf4 Merge pull request #4200 from pejakm/dismbg
More disabmiguations
2014-02-08 16:26:53 +01:00
Mladen Pejaković
f09a0c00a8 More disabmiguations 2014-02-08 16:09:27 +01:00
John Maguire
ef6d53c5ac Merge pull request #4199 from pejakm/popravke
Fix extraction of context messages from ui files + more disambiguations
2014-02-08 15:17:58 +01:00
Krzysztof A. Sobiecki
8f646de79d A hack to check code with cpplint.py 2014-02-08 15:11:55 +01:00
Mladen Pejaković
da535d6429 More disambiguations 2014-02-08 15:11:06 +01:00
Mladen Pejaković
2114494375 Fix extraction of context messages from Qt ui files 2014-02-08 15:08:37 +01:00
Mattias Andersson
175827f73f Add a tool tip to the library search field. 2014-02-08 14:50:12 +01:00
Dave Sansome
89369029ab Merge branch 'skip_track' of https://github.com/asiviero/Clementine into asiviero-skip_track
Conflicts:
	src/playlist/playlist.cpp
	src/playlist/playlistitem.h
	src/ui/mainwindow.cpp
2014-02-08 13:19:23 +11:00
Krzysztof A. Sobiecki
b7da89b978 Default filters are already set, no need for it here 2014-02-07 22:35:29 +01:00
Krzysztof A. Sobiecki
90c69db428 Set default filters in cpplint.py 2014-02-07 22:35:29 +01:00
Krzysztof A. Sobiecki
da4658c5fc New line with newline 2014-02-07 22:35:29 +01:00
Krzysztof A. Sobiecki
1e6fc23940 Add cpplint.py options used by myself 2014-02-07 22:35:29 +01:00
Krzysztof A. Sobiecki
6cf22ed5d2 Updated and modified cpplint.py 2014-02-07 22:35:29 +01:00