From 3db482e29a397bf7959f114cdeab5d0e7febef15 Mon Sep 17 00:00:00 2001 From: koldo Date: Fri, 28 Dec 2012 16:30:24 +0000 Subject: [PATCH] SysInfo: Major update git-svn-id: svn://ultimatepp.org/upp/trunk@5670 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/SysInfo/SysInfo.cpp | 19 +++++++++++++++++++ bazaar/SysInfo/SysInfo.h | 4 ++++ bazaar/SysInfo/SysInfo.t | 12 ++++++++++++ bazaar/SysInfo/SysInfo_in.h | 4 ++-- .../SysInfo/srcdoc.tpp/ChangesLog$en-us.tpp | 2 +- .../SysInfo/srcdoc.tpp/ChangesLog$en-us.tppi | 6 +++--- bazaar/SysInfo/srcimp.tpp/SysInfo$en-us.tpp | 6 +++--- 7 files changed, 44 insertions(+), 9 deletions(-) diff --git a/bazaar/SysInfo/SysInfo.cpp b/bazaar/SysInfo/SysInfo.cpp index d9f17a1b3..8ead430de 100644 --- a/bazaar/SysInfo/SysInfo.cpp +++ b/bazaar/SysInfo/SysInfo.cpp @@ -13,6 +13,10 @@ NAMESPACE_UPP +#define TFILE +#include ; + + ///////////////////////////////////////////////////////////////////// // Hardware Info #if defined(PLATFORM_WIN32) @@ -1614,6 +1618,21 @@ bool Window_SetRect(long windowId, long left, long top, long right, long bottom) return PutWindowPlacement((HWND)windowId, rcNormalPosition, ptMinPosition, ptMaxPosition, showcmd, 0); } +void Window_Bottom(long windowId) +{ + SetWindowPos((HWND)windowId, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE || SWP_NOSIZE || SWP_SHOWWINDOW); +} + +void Window_Top(long windowId) +{ + SetWindowPos((HWND)windowId, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE || SWP_NOSIZE || SWP_SHOWWINDOW); +} + +void Window_TopMost(long windowId) +{ + SetWindowPos((HWND)windowId, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE || SWP_NOSIZE || SWP_SHOWWINDOW); +} + #endif #ifdef PLATFORM_POSIX diff --git a/bazaar/SysInfo/SysInfo.h b/bazaar/SysInfo/SysInfo.h index 363e88e0f..198ebd88e 100644 --- a/bazaar/SysInfo/SysInfo.h +++ b/bazaar/SysInfo/SysInfo.h @@ -106,6 +106,10 @@ bool CloseCDTray(String drive); // Key and mouse keys bool Window_GetRect(long windowId, long &left, long &top, long &right, long &bottom); bool Window_SetRect(long windowId, long left, long top, long right, long bottom); +void Window_Bottom(long windowId); +void Window_Top(long windowId); +void Window_TopMost(long windowId); + bool Mouse_GetPos(long &x, long &y); bool Mouse_SetPos(long x, long y, long windowId); diff --git a/bazaar/SysInfo/SysInfo.t b/bazaar/SysInfo/SysInfo.t index ebe42b556..cdaac6dc7 100644 --- a/bazaar/SysInfo/SysInfo.t +++ b/bazaar/SysInfo/SysInfo.t @@ -4,16 +4,28 @@ // SysInfo.cpp T_("UNKNOWN") +caES("") esES("DESCONOCIDO") +euES("") +frFR("") T_("Not possible to change Desktop bitmap") +caES("") esES("No es posible cambiar la imagen del Escritorio") +euES("") +frFR("") T_("Error %s changing Desktop bitmap") +caES("") esES("Error %s cambiando la imagen del Escritorio") +euES("") +frFR("") // scrrengrab.cpp T_("Unknown grab mode") +caES("") esES("Modo de grabaci\303\263n desconocida") +euES("") +frFR("") diff --git a/bazaar/SysInfo/SysInfo_in.h b/bazaar/SysInfo/SysInfo_in.h index 3dfb28e2c..fa301ba70 100644 --- a/bazaar/SysInfo/SysInfo_in.h +++ b/bazaar/SysInfo/SysInfo_in.h @@ -10,8 +10,8 @@ #include #define CY tagCY // To compile in MinGW copy files Rpcsal.h, DispEx.h, WbemCli.h, WbemDisp.h, Wbemidl.h, - // WbemProv.h and WbemTran.h from /plugin to MinGW/include and - // wbemuuid.lib from /plugin to MinGW/lib + // WbemProv.h and WbemTran.h from /SysInfo/plugin to MinGW/include and + // wbemuuid.lib from /SysInfo/plugin to MinGW/lib #include #include #include diff --git a/bazaar/SysInfo/srcdoc.tpp/ChangesLog$en-us.tpp b/bazaar/SysInfo/srcdoc.tpp/ChangesLog$en-us.tpp index a4961c366..b63566d2c 100644 --- a/bazaar/SysInfo/srcdoc.tpp/ChangesLog$en-us.tpp +++ b/bazaar/SysInfo/srcdoc.tpp/ChangesLog$en-us.tpp @@ -4,7 +4,7 @@ topic "News and changes log"; [{_}%EN-US [s0; [*R6 SysInfo. News and changes log]&] [s0;2 &] -[s0;2 &] +[s0; [2 2012/11/30-|Added Window`_Bottom(), Window`_Top() and Window`_TopMost().]&] [s0; [2 2012/07/03-|Improved GetAdapterInfo() thanks to mdelfede.]&] [s0; [2 2012/07/02-|Added GetNetworkInfo(). Included NAMESPACE`_UPP.]&] [s0; [2 2010/09/07-|Added GetAdapterInfo(). It substitutes GetMacAddress().]&] diff --git a/bazaar/SysInfo/srcdoc.tpp/ChangesLog$en-us.tppi b/bazaar/SysInfo/srcdoc.tpp/ChangesLog$en-us.tppi index 0f7eaffde..ec56ece1c 100644 --- a/bazaar/SysInfo/srcdoc.tpp/ChangesLog$en-us.tppi +++ b/bazaar/SysInfo/srcdoc.tpp/ChangesLog$en-us.tppi @@ -1,6 +1,6 @@ TITLE("News and changes log") COMPRESSED -120,156,141,148,219,110,218,64,16,134,95,101,164,30,148,68,1,108,99,14,33,87,132,36,45,42,80,84,7,69,42,66,176,216,99,88,97,239,90,222,117,18,84,250,238,157,53,208,112,74,83,110,176,215,51,223,156,254,217,33,124,252,104,93,90,31,172,119,126,141,91,12,89,22,233,209,144,213,203,215,23,63,170,228,103,147,95,217,46,219,150,93,117,220,154,235,88,101,203,113,109,167,98,215,235,174,93,171,212,203,87,213,106,195,103,137,230,82,140,134,191,198,191,63,221,245,10,3,15,134,202,186,134,161,97,120,75,213,22,161,44,66,15,159,21,48,17,128,63,103,98,134,10,34,57,27,125,30,25,75,7,246,255,97,232,128,99,217,78,201,170,149,172,114,97,213,142,147,84,62,97,0,95,80,55,3,138,134,169,97,158,157,131,38,214,66,129,150,16,7,24,133,24,96,113,116,130,225,20,86,205,32,88,3,122,168,159,101,186,88,3,138,208,22,126,148,153,79,189,102,247,206,235,55,91,119,147,241,160,223,63,192,88,37,235,138,72,59,152,189,60,8,163,65,101,83, -165,185,206,52,213,70,6,93,230,147,113,138,74,209,247,35,90,173,228,212,11,171,3,51,224,2,30,185,8,36,117,74,200,103,200,20,161,88,164,36,240,100,30,37,44,225,48,69,159,209,49,200,16,30,187,109,72,49,226,108,202,35,174,151,199,49,170,251,25,239,69,10,101,10,29,46,178,151,83,94,149,29,175,86,127,240,128,113,130,41,211,89,138,228,105,70,200,183,3,105,182,250,109,42,60,73,100,170,143,72,21,130,189,21,223,80,232,236,235,173,135,41,103,209,38,163,77,241,69,184,231,47,107,167,27,46,213,102,214,1,211,8,211,108,118,20,199,45,217,238,54,206,148,236,215,72,35,138,125,128,137,25,75,61,199,116,42,89,26,128,218,181,35,157,106,140,215,150,71,17,236,188,39,100,117,139,106,161,101,210,101,130,205,48,37,73,19,208,244,129,24,247,153,240,205,26,40,119,240,134,255,67,202,212,28,110,104,200,129,244,179,24,133,102,198,225,125,4,105,143,132,236,92,21,86,29,70,38,243,123,30,225,107,15,111,83,254,132,29,174,52,29,253,47,106,119, -169,184,32,29,139,60,21,234,198,102,152,70,138,223,112,57,157,140,61,20,1,61,169,131,182,172,65,54,13,248,208,236,18,38,23,244,212,145,254,194,163,10,179,237,184,187,146,132,59,25,79,46,232,125,19,37,143,126,66,135,27,56,173,109,71,178,192,148,75,1,88,136,16,230,186,32,17,20,139,180,115,70,51,51,169,243,245,167,82,128,235,247,75,183,237,195,140,243,228,60,193,18,147,27,132,91,239,195,101,220,54,102,32,184,47,3,147,74,132,32,88,140,234,68,20,115,227,120,50,198,29,220,223,209,8,82,77,194,252,5,41,232,159,185,218,37,135,40,166,248,7,153,75,135,148,115,118,222,216,236,198,235,205,247,115,186,244,231,39,188,45,55,151,236,247,141,252,27,176,222,144,109,29,228,185,45,207,195,39,20,71,4,43,151,73,43,69,166,243,120,124,247,202,134,209,232,15,49,36,255,102, +120,156,141,148,219,110,218,64,16,134,95,101,164,166,85,18,5,176,205,33,36,185,34,167,22,21,40,170,65,145,138,16,172,237,1,86,216,187,150,119,29,18,53,125,247,206,26,59,225,148,166,220,96,150,153,111,254,153,253,199,35,56,58,178,206,172,79,214,7,159,203,91,156,177,52,212,227,17,107,86,175,78,127,54,40,207,166,188,170,93,181,45,187,225,212,206,107,142,85,181,156,154,237,212,237,102,179,102,159,215,155,213,139,70,227,210,103,177,230,82,140,71,191,39,127,62,223,245,74,67,23,70,202,186,130,145,97,184,207,170,45,102,178,12,61,92,41,96,34,0,127,193,196,28,21,132,114,62,254,50,54,145,14,172,191,97,228,128,99,217,78,197,182,43,85,171,244,210,10,2,12,224,129,139,64,174,166,147,107,169,181,140,142,79,206,94,79,6,50,62,62,201,152,27,39,93,169,244,241,73,121,188,131,180,206,43,86,181,244,210,142,226,68,62,18,245,43,234,86,64,194,49,49,242,8,163,73,214,82,129,150,16,5,24,206,48,192,131,12,167,144,69,128,30,234,149, +76,150,107,64,25,218,194,15,83,243,87,175,213,189,115,251,173,155,187,233,100,216,239,239,96,172,138,117,65,164,13,204,150,14,194,104,80,169,167,52,215,169,166,49,81,64,151,249,20,156,160,82,123,141,89,70,148,211,44,189,236,132,1,23,249,80,20,8,185,130,84,17,138,133,74,2,143,23,97,204,98,14,30,250,140,142,65,206,224,161,219,134,4,67,206,60,30,114,253,188,95,163,177,173,120,171,210,76,38,208,225,34,125,58,148,85,223,200,186,233,15,7,24,197,152,48,157,38,152,223,28,47,46,164,117,211,111,83,227,113,44,19,189,71,170,19,236,189,250,134,66,103,223,110,93,76,56,11,115,69,121,243,101,184,231,79,235,164,107,46,85,126,215,1,211,8,94,58,223,171,83,171,216,181,162,142,71,241,107,164,49,197,54,192,212,140,164,94,96,226,73,150,4,160,54,227,200,242,26,163,117,228,94,5,59,155,9,69,221,162,90,106,178,43,19,108,142,9,109,7,1,205,28,136,113,159,10,223,108,148,170,13,223,201,31,36,76,45,224,154,46,57,144,126,26,161, +208,204,36,124,140,32,239,145,145,157,139,210,75,135,81,200,226,158,135,248,54,195,219,132,63,98,135,155,5,250,111,212,230,82,113,65,62,22,153,20,154,70,126,153,198,138,223,241,217,155,78,92,20,1,61,169,157,177,172,65,54,93,240,110,216,25,76,79,233,169,35,253,165,75,29,166,197,117,119,37,25,119,58,153,158,210,239,188,74,86,253,128,15,115,56,173,109,71,178,192,180,75,5,216,12,97,150,249,130,76,80,46,211,206,25,207,204,165,206,214,159,90,1,174,63,110,221,182,119,21,103,226,92,193,98,163,13,102,69,246,238,50,22,131,25,10,238,203,192,72,9,17,4,139,80,29,168,98,222,56,174,140,112,3,247,122,53,130,92,19,51,127,73,14,250,167,86,187,226,16,197,52,63,144,153,117,200,57,199,39,151,249,110,188,189,249,126,121,207,254,226,64,182,85,203,44,251,35,183,255,37,172,55,164,232,131,50,139,246,92,124,68,177,71,176,50,155,220,36,200,116,86,143,111,190,253,97,60,254,11,244,67,23,211, diff --git a/bazaar/SysInfo/srcimp.tpp/SysInfo$en-us.tpp b/bazaar/SysInfo/srcimp.tpp/SysInfo$en-us.tpp index 26a7b133f..01de59b98 100644 --- a/bazaar/SysInfo/srcimp.tpp/SysInfo$en-us.tpp +++ b/bazaar/SysInfo/srcimp.tpp/SysInfo$en-us.tpp @@ -43,8 +43,8 @@ in Ubuntu can run properly in Fedora without recompiling.&] [s0; SysInfo has been tested in Linux using Gcc and in Windows using MinGW and MSC.&] [s0; &] -[s0;~~~2048; [*@6 IMPORTANT][* :] To compile using MinGW it is required -to copy the next files from SysInfo/plugin:&] +[s0;~~~2048; [*@6 IMPORTANT][* :] To compile using MinGW in Windows it +is required to copy the next files from SysInfo/plugin:&] [s0;i150;O0; To `\MinGW`\include: &] [s0;l96; Files [* Rpcsal.h, DispEx.h, WbemCli.h, WbemDisp.h, Wbemidl.h, WbemProv.h and WbemTran.h.]&] @@ -570,4 +570,4 @@ tried and the reason:&] :: [s0; ] :: [s0; ] :: [s0; [$2 Live version not found]]}}&] -[s0; ] \ No newline at end of file +[s0; ]] \ No newline at end of file