diff --git a/data/images/checkboxhid.png b/data/images/checkboxhid.png index 2ac0b42e..e524a3ca 100644 Binary files a/data/images/checkboxhid.png and b/data/images/checkboxhid.png differ diff --git a/data/images/checkboxreq.png b/data/images/checkboxreq.png index 2b14859c..08d5e62b 100644 Binary files a/data/images/checkboxreq.png and b/data/images/checkboxreq.png differ diff --git a/data/images/checkboxs.png b/data/images/checkboxs.png index 97630b6a..cb328b20 100644 Binary files a/data/images/checkboxs.png and b/data/images/checkboxs.png differ diff --git a/data/images/wait_01.jpg b/data/images/wait_01.jpg new file mode 100644 index 00000000..de8c7bdc Binary files /dev/null and b/data/images/wait_01.jpg differ diff --git a/data/images/wait_01.png b/data/images/wait_01.png deleted file mode 100644 index dbf5c0e0..00000000 Binary files a/data/images/wait_01.png and /dev/null differ diff --git a/data/images/wait_02.jpg b/data/images/wait_02.jpg new file mode 100644 index 00000000..8f047dc5 Binary files /dev/null and b/data/images/wait_02.jpg differ diff --git a/data/images/wait_02.png b/data/images/wait_02.png deleted file mode 100644 index 25f466fd..00000000 Binary files a/data/images/wait_02.png and /dev/null differ diff --git a/data/images/wait_03.jpg b/data/images/wait_03.jpg new file mode 100644 index 00000000..33aa7ead Binary files /dev/null and b/data/images/wait_03.jpg differ diff --git a/data/images/wait_03.png b/data/images/wait_03.png deleted file mode 100644 index 952e231e..00000000 Binary files a/data/images/wait_03.png and /dev/null differ diff --git a/data/images/wait_04.jpg b/data/images/wait_04.jpg new file mode 100644 index 00000000..60ad4a54 Binary files /dev/null and b/data/images/wait_04.jpg differ diff --git a/data/images/wait_04.png b/data/images/wait_04.png deleted file mode 100644 index f2be7d8c..00000000 Binary files a/data/images/wait_04.png and /dev/null differ diff --git a/data/images/wait_05.jpg b/data/images/wait_05.jpg new file mode 100644 index 00000000..4fb9b7b4 Binary files /dev/null and b/data/images/wait_05.jpg differ diff --git a/data/images/wait_05.png b/data/images/wait_05.png deleted file mode 100644 index d1e6c66c..00000000 Binary files a/data/images/wait_05.png and /dev/null differ diff --git a/data/images/wait_06.jpg b/data/images/wait_06.jpg new file mode 100644 index 00000000..489a8dd4 Binary files /dev/null and b/data/images/wait_06.jpg differ diff --git a/data/images/wait_06.png b/data/images/wait_06.png deleted file mode 100644 index 6bbacc25..00000000 Binary files a/data/images/wait_06.png and /dev/null differ diff --git a/data/images/wait_07.jpg b/data/images/wait_07.jpg new file mode 100644 index 00000000..d5a70d8d Binary files /dev/null and b/data/images/wait_07.jpg differ diff --git a/data/images/wait_07.png b/data/images/wait_07.png deleted file mode 100644 index 1cdd030d..00000000 Binary files a/data/images/wait_07.png and /dev/null differ diff --git a/data/images/wait_08.jpg b/data/images/wait_08.jpg new file mode 100644 index 00000000..34479b81 Binary files /dev/null and b/data/images/wait_08.jpg differ diff --git a/data/images/wait_08.png b/data/images/wait_08.png deleted file mode 100644 index 05fe20e5..00000000 Binary files a/data/images/wait_08.png and /dev/null differ diff --git a/data/images/wait_09.png b/data/images/wait_09.png deleted file mode 100644 index 6167cabf..00000000 Binary files a/data/images/wait_09.png and /dev/null differ diff --git a/data/images/wait_10.png b/data/images/wait_10.png deleted file mode 100644 index e1caf5e0..00000000 Binary files a/data/images/wait_10.png and /dev/null differ diff --git a/resources/optipng.exe b/resources/optipng.exe index 9b0c9e05..85c4649d 100644 Binary files a/resources/optipng.exe and b/resources/optipng.exe differ diff --git a/resources/theme_pngs/wait_01.png b/resources/theme_pngs/wait_01.png new file mode 100644 index 00000000..d6e061c2 Binary files /dev/null and b/resources/theme_pngs/wait_01.png differ diff --git a/resources/theme_pngs/wait_02.png b/resources/theme_pngs/wait_02.png new file mode 100644 index 00000000..f5eb6804 Binary files /dev/null and b/resources/theme_pngs/wait_02.png differ diff --git a/resources/theme_pngs/wait_03.png b/resources/theme_pngs/wait_03.png new file mode 100644 index 00000000..7741daff Binary files /dev/null and b/resources/theme_pngs/wait_03.png differ diff --git a/resources/theme_pngs/wait_04.png b/resources/theme_pngs/wait_04.png new file mode 100644 index 00000000..ddf7a518 Binary files /dev/null and b/resources/theme_pngs/wait_04.png differ diff --git a/resources/theme_pngs/wait_05.png b/resources/theme_pngs/wait_05.png new file mode 100644 index 00000000..7672c150 Binary files /dev/null and b/resources/theme_pngs/wait_05.png differ diff --git a/resources/theme_pngs/wait_06.png b/resources/theme_pngs/wait_06.png new file mode 100644 index 00000000..9611a4cb Binary files /dev/null and b/resources/theme_pngs/wait_06.png differ diff --git a/resources/theme_pngs/wait_07.png b/resources/theme_pngs/wait_07.png new file mode 100644 index 00000000..560deddb Binary files /dev/null and b/resources/theme_pngs/wait_07.png differ diff --git a/resources/theme_pngs/wait_08.png b/resources/theme_pngs/wait_08.png new file mode 100644 index 00000000..cb1d734f Binary files /dev/null and b/resources/theme_pngs/wait_08.png differ diff --git a/source/gui/video.cpp b/source/gui/video.cpp index 59d44b12..b817d5a2 100644 --- a/source/gui/video.cpp +++ b/source/gui/video.cpp @@ -11,16 +11,22 @@ #define DEFAULT_FIFO_SIZE (256 * 1024) -extern const u8 wait_01_png[]; -extern const u8 wait_02_png[]; -extern const u8 wait_03_png[]; -extern const u8 wait_04_png[]; -extern const u8 wait_05_png[]; -extern const u8 wait_06_png[]; -extern const u8 wait_07_png[]; -extern const u8 wait_08_png[]; -extern const u8 wait_09_png[]; -extern const u8 wait_10_png[]; +extern const u8 wait_01_jpg[]; +extern const u32 wait_01_jpg_size; +extern const u8 wait_02_jpg[]; +extern const u32 wait_02_jpg_size; +extern const u8 wait_03_jpg[]; +extern const u32 wait_03_jpg_size; +extern const u8 wait_04_jpg[]; +extern const u32 wait_04_jpg_size; +extern const u8 wait_05_jpg[]; +extern const u32 wait_05_jpg_size; +extern const u8 wait_06_jpg[]; +extern const u32 wait_06_jpg_size; +extern const u8 wait_07_jpg[]; +extern const u32 wait_07_jpg_size; +extern const u8 wait_08_jpg[]; +extern const u32 wait_08_jpg_size; vector m_defaultWaitMessages; @@ -565,18 +571,16 @@ void CVideo::waitMessage(float delay) { if(m_defaultWaitMessages.size() == 0) { - TexData m_wTextures[10]; - TexHandle.fromPNG(m_wTextures[0], wait_01_png); - TexHandle.fromPNG(m_wTextures[1], wait_02_png); - TexHandle.fromPNG(m_wTextures[2], wait_03_png); - TexHandle.fromPNG(m_wTextures[3], wait_04_png); - TexHandle.fromPNG(m_wTextures[4], wait_05_png); - TexHandle.fromPNG(m_wTextures[5], wait_06_png); - TexHandle.fromPNG(m_wTextures[6], wait_07_png); - TexHandle.fromPNG(m_wTextures[7], wait_08_png); - TexHandle.fromPNG(m_wTextures[8], wait_09_png); - TexHandle.fromPNG(m_wTextures[9], wait_10_png); - for(int i = 0; i < 10; i++) + TexData m_wTextures[8]; + TexHandle.fromJPG(m_wTextures[0], wait_01_jpg, wait_01_jpg_size); + TexHandle.fromJPG(m_wTextures[1], wait_02_jpg, wait_02_jpg_size); + TexHandle.fromJPG(m_wTextures[2], wait_03_jpg, wait_03_jpg_size); + TexHandle.fromJPG(m_wTextures[3], wait_04_jpg, wait_04_jpg_size); + TexHandle.fromJPG(m_wTextures[4], wait_05_jpg, wait_05_jpg_size); + TexHandle.fromJPG(m_wTextures[5], wait_06_jpg, wait_06_jpg_size); + TexHandle.fromJPG(m_wTextures[6], wait_07_jpg, wait_07_jpg_size); + TexHandle.fromJPG(m_wTextures[7], wait_08_jpg, wait_08_jpg_size); + for(int i = 0; i < 8; i++) m_defaultWaitMessages.push_back(m_wTextures[i]); } waitMessage(vector(), delay); @@ -588,7 +592,7 @@ void CVideo::waitMessage(const vector &tex, float delay) if(tex.size() == 0) { m_waitMessages = m_defaultWaitMessages; - m_waitMessageDelay = 0.12f; + m_waitMessageDelay = 0.15f; } else {