diff --git a/.gitignore b/.gitignore index 919bcb9..a0677f0 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ profile /server/tp_core/testssh/Debug /server/tp_core/testssh/Release +/client/build-tp-player-* diff --git a/client/tp-player/res/bar.psd b/client/tp-player/res/bar.psd index 8348da1..a2defc8 100644 Binary files a/client/tp-player/res/bar.psd and b/client/tp-player/res/bar.psd differ diff --git a/client/tp-player/res/bar/bg-left.png b/client/tp-player/res/bar/bg-left.png index 58f3c21..e20e24c 100644 Binary files a/client/tp-player/res/bar/bg-left.png and b/client/tp-player/res/bar/bg-left.png differ diff --git a/client/tp-player/res/bar/bg-mid.png b/client/tp-player/res/bar/bg-mid.png index 870affc..974129a 100644 Binary files a/client/tp-player/res/bar/bg-mid.png and b/client/tp-player/res/bar/bg-mid.png differ diff --git a/client/tp-player/res/bar/bg-right.png b/client/tp-player/res/bar/bg-right.png index 8cbb474..c6b31a0 100644 Binary files a/client/tp-player/res/bar/bg-right.png and b/client/tp-player/res/bar/bg-right.png differ diff --git a/client/tp-player/res/bar/btn-hover-left.png b/client/tp-player/res/bar/btn-hover-left.png new file mode 100644 index 0000000..7914efb Binary files /dev/null and b/client/tp-player/res/bar/btn-hover-left.png differ diff --git a/client/tp-player/res/bar/btnsel-mid.png b/client/tp-player/res/bar/btn-hover-mid.png similarity index 51% rename from client/tp-player/res/bar/btnsel-mid.png rename to client/tp-player/res/bar/btn-hover-mid.png index 03c01ea..a1db349 100644 Binary files a/client/tp-player/res/bar/btnsel-mid.png and b/client/tp-player/res/bar/btn-hover-mid.png differ diff --git a/client/tp-player/res/bar/btn-hover-right.png b/client/tp-player/res/bar/btn-hover-right.png new file mode 100644 index 0000000..cfd1348 Binary files /dev/null and b/client/tp-player/res/bar/btn-hover-right.png differ diff --git a/client/tp-player/res/bar/btn-left.png b/client/tp-player/res/bar/btn-left.png deleted file mode 100644 index d59d51f..0000000 Binary files a/client/tp-player/res/bar/btn-left.png and /dev/null differ diff --git a/client/tp-player/res/bar/btn-normal-left.png b/client/tp-player/res/bar/btn-normal-left.png new file mode 100644 index 0000000..eb9b22a Binary files /dev/null and b/client/tp-player/res/bar/btn-normal-left.png differ diff --git a/client/tp-player/res/bar/btn-mid.png b/client/tp-player/res/bar/btn-normal-mid.png similarity index 51% rename from client/tp-player/res/bar/btn-mid.png rename to client/tp-player/res/bar/btn-normal-mid.png index 07c0acc..06608db 100644 Binary files a/client/tp-player/res/bar/btn-mid.png and b/client/tp-player/res/bar/btn-normal-mid.png differ diff --git a/client/tp-player/res/bar/btn-normal-right.png b/client/tp-player/res/bar/btn-normal-right.png new file mode 100644 index 0000000..53f68d8 Binary files /dev/null and b/client/tp-player/res/bar/btn-normal-right.png differ diff --git a/client/tp-player/res/bar/btn-right.png b/client/tp-player/res/bar/btn-right.png deleted file mode 100644 index a5e986f..0000000 Binary files a/client/tp-player/res/bar/btn-right.png and /dev/null differ diff --git a/client/tp-player/res/bar/btn-sel-left.png b/client/tp-player/res/bar/btn-sel-left.png new file mode 100644 index 0000000..e26b79e Binary files /dev/null and b/client/tp-player/res/bar/btn-sel-left.png differ diff --git a/client/tp-player/res/bar/btn-sel-mid.png b/client/tp-player/res/bar/btn-sel-mid.png new file mode 100644 index 0000000..f69acf2 Binary files /dev/null and b/client/tp-player/res/bar/btn-sel-mid.png differ diff --git a/client/tp-player/res/bar/btn-sel-right.png b/client/tp-player/res/bar/btn-sel-right.png new file mode 100644 index 0000000..ccfab12 Binary files /dev/null and b/client/tp-player/res/bar/btn-sel-right.png differ diff --git a/client/tp-player/res/bar/btnsel-left.png b/client/tp-player/res/bar/btnsel-left.png deleted file mode 100644 index a84e74b..0000000 Binary files a/client/tp-player/res/bar/btnsel-left.png and /dev/null differ diff --git a/client/tp-player/res/bar/btnsel-right.png b/client/tp-player/res/bar/btnsel-right.png deleted file mode 100644 index cfa0078..0000000 Binary files a/client/tp-player/res/bar/btnsel-right.png and /dev/null differ diff --git a/client/tp-player/res/bar/chkbox-hover.png b/client/tp-player/res/bar/chkbox-hover.png new file mode 100644 index 0000000..485711a Binary files /dev/null and b/client/tp-player/res/bar/chkbox-hover.png differ diff --git a/client/tp-player/res/bar/chkbox-normal.png b/client/tp-player/res/bar/chkbox-normal.png new file mode 100644 index 0000000..1ac352d Binary files /dev/null and b/client/tp-player/res/bar/chkbox-normal.png differ diff --git a/client/tp-player/res/bar/chkbox-sel-hover.png b/client/tp-player/res/bar/chkbox-sel-hover.png new file mode 100644 index 0000000..47970ca Binary files /dev/null and b/client/tp-player/res/bar/chkbox-sel-hover.png differ diff --git a/client/tp-player/res/bar/chkbox-sel-normal.png b/client/tp-player/res/bar/chkbox-sel-normal.png new file mode 100644 index 0000000..872fe0c Binary files /dev/null and b/client/tp-player/res/bar/chkbox-sel-normal.png differ diff --git a/client/tp-player/res/bar/pause-hover.png b/client/tp-player/res/bar/pause-hover.png index a4f6c99..a220452 100644 Binary files a/client/tp-player/res/bar/pause-hover.png and b/client/tp-player/res/bar/pause-hover.png differ diff --git a/client/tp-player/res/bar/pause-normal.png b/client/tp-player/res/bar/pause-normal.png new file mode 100644 index 0000000..455497e Binary files /dev/null and b/client/tp-player/res/bar/pause-normal.png differ diff --git a/client/tp-player/res/bar/pause.png b/client/tp-player/res/bar/pause.png deleted file mode 100644 index 66b4bb3..0000000 Binary files a/client/tp-player/res/bar/pause.png and /dev/null differ diff --git a/client/tp-player/res/bar/play-hover.png b/client/tp-player/res/bar/play-hover.png index a4f6c99..1bb55a9 100644 Binary files a/client/tp-player/res/bar/play-hover.png and b/client/tp-player/res/bar/play-hover.png differ diff --git a/client/tp-player/res/bar/play-normal.png b/client/tp-player/res/bar/play-normal.png new file mode 100644 index 0000000..430f6f4 Binary files /dev/null and b/client/tp-player/res/bar/play-normal.png differ diff --git a/client/tp-player/res/bar/play.png b/client/tp-player/res/bar/play.png deleted file mode 100644 index 66b4bb3..0000000 Binary files a/client/tp-player/res/bar/play.png and /dev/null differ diff --git a/client/tp-player/res/bar/prgbar-mid.png b/client/tp-player/res/bar/prgbar-mid.png index 59ac7d7..4e7d3a0 100644 Binary files a/client/tp-player/res/bar/prgbar-mid.png and b/client/tp-player/res/bar/prgbar-mid.png differ diff --git a/client/tp-player/res/bar/prgbar-right.png b/client/tp-player/res/bar/prgbar-right.png index d7d3f3f..8897c17 100644 Binary files a/client/tp-player/res/bar/prgbar-right.png and b/client/tp-player/res/bar/prgbar-right.png differ diff --git a/client/tp-player/res/bar/prgbarh-left.png b/client/tp-player/res/bar/prgbarh-left.png index 4f936ff..9a6ba68 100644 Binary files a/client/tp-player/res/bar/prgbarh-left.png and b/client/tp-player/res/bar/prgbarh-left.png differ diff --git a/client/tp-player/res/bar/prgbarh-mid.png b/client/tp-player/res/bar/prgbarh-mid.png index 17705f7..baeb2f6 100644 Binary files a/client/tp-player/res/bar/prgbarh-mid.png and b/client/tp-player/res/bar/prgbarh-mid.png differ diff --git a/client/tp-player/res/bar/prgpt-hover.png b/client/tp-player/res/bar/prgpt-hover.png index 51cb232..e98d208 100644 Binary files a/client/tp-player/res/bar/prgpt-hover.png and b/client/tp-player/res/bar/prgpt-hover.png differ diff --git a/client/tp-player/res/bar/prgpt-normal.png b/client/tp-player/res/bar/prgpt-normal.png new file mode 100644 index 0000000..59e1faa Binary files /dev/null and b/client/tp-player/res/bar/prgpt-normal.png differ diff --git a/client/tp-player/res/bar/prgpt.png b/client/tp-player/res/bar/prgpt.png deleted file mode 100644 index 0973ffd..0000000 Binary files a/client/tp-player/res/bar/prgpt.png and /dev/null differ diff --git a/client/tp-player/tp-player.qrc b/client/tp-player/tp-player.qrc index 4175b85..f79019d 100644 --- a/client/tp-player/tp-player.qrc +++ b/client/tp-player/tp-player.qrc @@ -2,26 +2,37 @@ res/bg.png res/cursor.png + res/bar/bg-left.png res/bar/bg-mid.png res/bar/bg-right.png - res/bar/btn-left.png - res/bar/btn-mid.png - res/bar/btn-right.png - res/bar/btnsel-left.png - res/bar/btnsel-mid.png - res/bar/btnsel-right.png + + res/bar/btn-normal-left.png + res/bar/btn-normal-mid.png + res/bar/btn-normal-right.png + res/bar/btn-sel-left.png + res/bar/btn-sel-mid.png + res/bar/btn-sel-right.png + res/bar/btn-hover-left.png + res/bar/btn-hover-mid.png + res/bar/btn-hover-right.png + res/bar/play-hover.png - res/bar/play.png + res/bar/play-normal.png res/bar/pause-hover.png - res/bar/pause.png + res/bar/pause-normal.png + res/bar/prgbar-mid.png res/bar/prgbar-right.png res/bar/prgbarh-left.png res/bar/prgbarh-mid.png + + res/bar/prgpt-normal.png res/bar/prgpt-hover.png - res/bar/prgpt.png - res/bar/select.png - res/bar/selected.png + + res/bar/chkbox-normal.png + res/bar/chkbox-hover.png + res/bar/chkbox-sel-normal.png + res/bar/chkbox-sel-hover.png