Merge branch 'about'

Conflicts:
	someplayer.pro

diff --cc someplayer.pro
index c1333c5,12e7248..eb13cc2
--- 1/someplayer.pro
--- 2/someplayer.pro
+++ b/someplayer.pro
@@@ -128,7 -128,7 +128,8 @@@ SOURCES += src/main.cpp
      src/clickablelabel.cpp \
      src/settingsform.cpp \
      src/dbusclient.cpp \
-     src/fmtxsettingsdialog.cpp
++    src/fmtxsettingsdialog.cpp \
+     src/aboutform.cpp
  
  HEADERS  += src/mainwindow.h \
                src/player/player.h \
@@@ -235,7 -235,7 +236,8 @@@
      src/clickablelabel.h \
      src/settingsform.h \
      src/dbusclient.h \
-     src/fmtxsettingsdialog.h
++    src/fmtxsettingsdialog.h \
+     src/aboutform.h
  
  FORMS    += src/ui/mainwindow.ui \
      src/ui/playerform.ui \
@@@ -250,7 -250,7 +252,8 @@@
      src/ui/managelibraryform.ui \
      src/ui/directoryview.ui \
      src/ui/settingsform.ui \
-     src/ui/fmtxsettingsdialog.ui
++    src/ui/fmtxsettingsdialog.ui \
+     src/ui/aboutform.ui
  
  CONFIG += mobility
  MOBILITY = 

diff --cc src/mainwindow.cpp
Simple merge

diff --cc src/mainwindow.h
Simple merge

diff --cc src/player/player.cpp
index 52f0ad2,51071b1..59d542b
--- 1/src/player/player.cpp
--- 2/src/player/player.cpp
+++ b/src/player/player.cpp
@@@ -74,10 -106,18 +74,12 @@@ Player::Player(QObject *parent) 
  }
  
  void Player::setTrackId(int id) {
 -      if (_random) {
 -              _randomizer.removeId(id);
 -      }
 -      _current = id;
 -      if (!_history.isEmpty() && _history.top() != _current || _history.isEmpty()) {
 -              _history.push(_current);
 -      }
 -      _track = _playlist.tracks().at(_current);
++      id = id < 0 ? 0 : id;
++      id = id >= _playlist.tracks().size() ? _playlist.tracks().size()-1 : id;
 +      _to_history(_track);
 +      _track = _playlist.tracks().at(id);
        _set_source();
 -      _state = PLAYER_LOADING;
 -      emit stateChanged(_state);
 +      play();
  }
  
  void Player::toggle() {