github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*SysInfo_demo_gui: Some updates after U++ changes and luoganda report

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10517 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2016-12-05 09:19:34 +00:00
parent e3836605a8
commit 7a3d8522b8
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bazaar/SysInfo_demo_gui/SysInfo_demo_gui.h
View file

@ -36,6 +36,7 @@ struct WindowsList_ : WithWindowsList<StaticRect> {
}
void Fill();
void ButUpdate_Push();
void ButTopmost_Push();
void MenuCallback(Bar &bar);
void CbCopy();
};

1
bazaar/SysInfo_demo_gui/SysInfo_demo_gui.lay
View file

@ -159,6 +159,7 @@ END_LAYOUT
LAYOUT(WindowsList, 672, 120)
ITEM(Label, dv___0, SetLabel(t_("Windows list")).SetFrame(ThinOutsetFrame()).HSizePosZ(0, 4).TopPosZ(0, 16))
ITEM(ArrayCtrl, Windows, HSizePosZ(0, 4).VSizePosZ(16, 36))
ITEM(Button, ButTopmost, SetLabel(t_("Set Topmost")).LeftPosZ(104, 88).BottomPosZ(5, 23))
ITEM(Button, ButUpdate, SetLabel(t_("Update")).LeftPosZ(4, 88).BottomPosZ(5, 23))
END_LAYOUT

16
bazaar/SysInfo_demo_gui/main.cpp
View file

@ -233,6 +233,7 @@ void SystemInfo::ButUpdate_Push() {
Fill();
}
#if defined(PLATFORM_WIN32) || defined (PLATFORM_WIN64)
#define SetBit(uIntFlagBuff, Bit) (uIntFlagBuff |= (Bit))
@ -355,12 +356,21 @@ void WindowsList_::Fill() {
}
Windows.SetEditable();
ButUpdate.WhenPush = THISBACK(ButUpdate_Push);
ButTopmost.WhenPush = THISBACK(ButTopmost_Push);
static MenuBar bar;
//GetList().StdToolBar(bar); //bar(2).Remove();bar(1).Remove();
//GetList().WhenToolBar=THISBACK(cb);
Windows.WhenBar = THISBACK(MenuCallback);
}
void WindowsList_::ButTopmost_Push() {
int row = Windows.GetCursor();
if (row < 0)
return;
int64 id = ScanInt64(String(Windows.Get(row, 1)));
Window_TopMost(id);
}
void WindowsList_::CbCopy() {
String text;
HeaderCtrl& header = Windows.HeaderObject();
@ -462,11 +472,11 @@ void ScreenGrabTab::ButGrab_Push() {
bool ret;
if (~SwGrabMode == 0)
ret = Record_Desktop(EditFileNameGrab, EditTime, EditFrameRate, OpGrabMouse);
ret = Record_Desktop(~EditFileNameGrab, EditTime, EditFrameRate, OpGrabMouse);
else if (~SwGrabMode == 1)
ret = Record_Window(EditFileNameGrab, EditTime, GetWindowIdFromCaption(EditWindowTitle, false), EditFrameRate, OpGrabMouse);
ret = Record_Window(~EditFileNameGrab, EditTime, GetWindowIdFromCaption(~EditWindowTitle, false), EditFrameRate, OpGrabMouse);
else if (~SwGrabMode == 2)
ret = Record_DesktopRectangle(EditFileNameGrab, EditTime, EditLeft, EditTop, EditWidth, EditHeight, EditFrameRate, OpGrabMouse);
ret = Record_DesktopRectangle(~EditFileNameGrab, EditTime, EditLeft, EditTop, EditWidth, EditHeight, EditFrameRate, OpGrabMouse);
else
throw Exc("Unexpected value");
if (!ret)